Speculatively revert 116753 and 116756 to attempt to fix the bots.