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

This reverts commit 32b7cf41d72e8d636fa84e768f2821407316b299.