Revert "Redesign use of image transform."
This reverts commit d423f6e9a1815a3b2320b2f4eb9b0fe9d8d37e53.