Revert r212375 because of test failures