Revert "Merge pull request #23939 from steveck-chung/crop-image-workaround"

This reverts commit d6f841f5bef301f5b19b03f5bf149b4c65b97f5e, reversing
changes made to 32d82d288abe2e55146c10c066234e8ba4982836.