Revert "Merge pull request #11751 from rexboy7/fix-bug900838"

This reverts commit 92d9a334d52514ac521ac0bb39add28e373bcc33, reversing
changes made to 92b79a2dfe09d950e3789247a21e13083116ec0a.