This reverts commit 70de684d. This causes a regression as described in #61785 (cherry picked from commit 104cd749)