This reverts commit d8a4ef0e. This commit broke some of the bots. I believe it's due to nondeterminism. Will fix and recommit.