Revert "Merge pull request #26757 from snowmantw/bug1110960-2.0"

This reverts commit 2ed1958558492b22fb2684917ad443265c95d497, reversing
changes made to ce83ea7b8e3fa2d1c3fd771fc22b654c18b3c381.

(Sorry for forgetting to submit the approval)