Revert "merge revision(s) 9682275b5493439334fb3933ce2da3b95271eb1c: [Backport #19999]"
This reverts commit 4b16259d1d6f408a88ac2c8d04ed78e87bdeda9f.
Revert "merge revision(s) 9682275b5493439334fb3933ce2da3b95271eb1c: [Backport #19999]"
This reverts commit 4b16259d1d6f408a88ac2c8d04ed78e87bdeda9f.