Revert "Merge pull request #21235 from snowmantw/issue1020917-2.0"

This reverts commit ee4cc647c7a599b210f9d8e76505f22926539d79, reversing
changes made to 7ad00b0bd84d5d97e0801e3b3ceaac33fcd90e05.