Revert "Merge pull request #26445 from pacorampas/1099397"

This reverts commit 7cc460af0f6f491d1afa6b6043cdea5025f0e15f, reversing
changes made to 30ad86d78c396ed746879d732e0cc8aad61b936a.
Merge remote-tracking branch 'upstream/master'