Revert "Merge pull request #13997 from dominickuo/bug-911108"

This reverts commit f830cdeb9931abf487a535085701137fb2e9892e, reversing
changes made to 0904f366263eca59f61afb9c340004f91e488870.