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