Revert "partially merge revision(s) 70ad58cb62b195ba86a5ef07a565b22b02a040ea: [Backport #20516]"
This reverts commit 519ac9c5fd7bfa75655231188ac1da9589563618.
Revert "partially merge revision(s) 70ad58cb62b195ba86a5ef07a565b22b02a040ea: [Backport #20516]"
This reverts commit 519ac9c5fd7bfa75655231188ac1da9589563618.