Revert "Merge pull request #24308 from nullaus/bug1062136"

This reverts commit ec32f3e5f2bb25568a23ab200cdbbd0b2a533ddd, reversing
changes made to 2f7e36df28bb47461b7362df84d5a3ec0ed8429a.