Revert r153694. It was causing failures in the buildbots.