Revert "Merge pull request #23483 from wilsonpage/1060294"

This reverts commit 3c04e67480a2f64b99d7a5cf84071f801f3d9a40, reversing
changes made to fd719f6fd74d74d88314429a07de68c655552609.