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

This reverts commit 4db70547e146f776461a9094de8829b5327b80b6, reversing
changes made to be36576f06390aa059c3da35dee76f7804e99b68.