Revert r125960, it's breaking darwin10 bootstrap.