Revert r202014.

Failing on the bots for an unknown reason.