Revert "Merge pull request #23309 from snowmantw/issue1055577"

This reverts commit aa00d7e02e592f7a4c2cafd68009d923150df613, reversing
changes made to 27c098b771f4b575dbf82df2727969ae7748070a.