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