Backout of bug 934070 for breaking debugging on OS X