Revert r180263. It's causing failures.