Revert r223049, r223050 and r223051 while investigating test failures.