Revert "Merge pull request #20540 from snowmantw/issue970824"

This reverts commit fa1ecd7f9703b6061e6b0a63bc160069ebd91b1f, reversing
changes made to 210754620ef706662c3379eb9fbb53c6e5b21baa.