Revert r195599 as it broke the builds.