This partially reverts 192a9d95 (#19432). Fixes #20305. (cherry picked from commit 74c1ab84) (cherry picked from commit 38388b95d71b7701922f90854ce568f74e11ed12) (cherry picked from commit 2e27dd58a85c3e8bd9d0e7ff200a2e07f422743df)