This reverts commit eb5d0f18. Together with 89f464e9, it breaks decoding of tiff files like fate-suite/exif/image_small.tiff