Revert "merge revision(s) 29500e3034681a30045dea462d6bb653e8600738: [Backport #20698]"
This reverts commit 3a3784a197383046537e66a9c567b96a52f0f86f.
Revert "merge revision(s) 29500e3034681a30045dea462d6bb653e8600738: [Backport #20698]"
This reverts commit 3a3784a197383046537e66a9c567b96a52f0f86f.