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

This reverts commit 88bda206b1def5d4beac3be851c904414563bea3.