ContentImageDecoder: Revert BaseImageDecoder changes