This reverts commit 7dc6e77bc2, reversing changes made to bce47ea9d5. Motivation for the revert in #67563
7dc6e77bc2
bce47ea9d5