Revert r202396, r202397.

These are causing test failures, revert for now.