Revert 179694 -- it breaks remote debugging of mac os x targets for some folk
- will commit a different workaround momentarily