This reverts commit 41d55b76.

This helps avoid running out of space for small images, where
header overhead is relatively large