This reverts commit 70de684d. This causes a regression as described in #61785
mentioned in commit 70e4662a