Revert "Merge pull request #16263 from yzen/969553"

This reverts commit e1c443d9ff62a21920d389be097d0e666f38e70b, reversing
changes made to e328318d5e27a3253061fb1679ab9abc82e60fcc.