Revert r188666: it breaks the buildbots