This commits breaks the libc++ modular build in the precommit CI. This reverts commit 74565c3a.
mentioned in commit 33e18cb6