Revert "Merge pull request #16647 from changm/bug975811"

This reverts commit 89950a14ec912d78f44345bd143fab1e0da23804, reversing
changes made to ff53e9a2cf3fb0d65b37831fb5bab6286a9f5d9a.