Revert "Merge pull request #16127 from changm/bug968478"

This reverts commit 76e32d1f2f0e747dd7f5e5097a00129a14aa9d02.