This reverts commit 32bc83d1. This is causing bots with expensive-checks to fail. Revert while I investigate.