This reverts commit 6c064e6b, reapplying PR #28029 which was supposed to have gone to staging all along.