backing out abf14e57b705 due to osx breakage