Revert "Merge pull request #16126 from changm/bug968311"

This reverts commit a793842680f82d3594973c6c8b91425d1fec0563.