This reverts commit 3794cc0e. This change is suspected of causing bots to hang at stage 2 compiles, so reverting to confirm and investigate.