Reverts #95002 while I investigate buildbot failure. This reverts commit 83b01aaf51072a07261ee2e5fc14102f71273bc0.