Revert part of heavily reduce difference between windows / linux

This reverts commit 6cba30bed7b4dbd3f177403d1bbf97180e7e02f9.