This reverts commit 52832cd9. The motivating commit 2f6b0731 caused several bots to hit an infinite loop at stage 2, so that needs to be reverted too while figuring out how to fix that.
