Revert "Unix fix"

This reverts commit d23a7fda6fd291606784c1fb4f24af6c65eae517.