Revert "Changed ImageScaleType.NONE to not scale down images anyway."

This reverts commit 366487782c2c319f1e9b2effabe227582dc07e89.