Revert "Merge pull request #15653 from dominickuo/bug-946556"

This reverts commit f9a37c77efb4621a1f57e4695b497d18601fe134.