Revert r224838, r224839.

Flaky failures on the build bots.