Revert "merge revision(s) 5fa6ba9568e87e43e08a4daeba1572254c589fb1: [Backport #20500]"
This reverts commit fc5b9ffad1b0710bd999521d0bf9631af6b762c2.
Revert "merge revision(s) 5fa6ba9568e87e43e08a4daeba1572254c589fb1: [Backport #20500]"
This reverts commit fc5b9ffad1b0710bd999521d0bf9631af6b762c2.