Revert "Merge pull request #22255 from JinghuaXing/bug947198_master"

This reverts commit 05176f64f15efd92c654d0eed801991ab2199bf8, reversing
changes made to efb6eb0a6387186c24f0fe469e61cdbe3670d37c.