revert back to andy's patch for building under darwin