Yes, in this implementation. This image-type-specific behavior needs to be thought out a bit more. I've decided to remove this functionality and make this PR feature-neutral. I'd like to keep the PRs small and focused so the image-type-specific framework will come as a future PR.