Revert "Merge branch '1265-version-2' into 'master'"

!36052 (merged) may have caused 404 errors to show up for images that are cropped automatically.