Revert "Revert "Always use transform of image.""
This reverts commit 1bcad4a8fc6cbe36bb8f7a98131790307a8d1f03.