Revert r141854 because it was causing failures: