Revert "Minor factoring:  move redundant resize scaling logic into the resize function."

This reverts commit 48973002.
(cherry picked from commit e82cf867)