Revert a few unsuccessful attempts at fixing bots.

I broke bots last week and tried a few things to fix them.
These were attempts that didn't help, so back them back out.

This reverts commit c7aff9a1.
This reverts commit 8838d6d3.
This reverts commit e875ba15.