Revert "Merge pull request #19559 from acperez/bug-1009633"

This reverts commit 8cee6e0e1b8037ec22c010399d7f2d06f3d9b0d2, reversing
changes made to 2cfd8e79ca6ee6bd163d3f4748e00af239cf2f23.