Temporarily revert r220777 to sort out build bot breakage.