undo #2522 merge except on darwin

It was only meant for darwin originally anyway.
See the PR for discussion.