@b4n I updated #1095 and picked the relevant commits from this PR and added 92294cb56679cd8943e454b246cbe96c76bcfcee on top of that which reverts (hopefully) all non-Windows changes.
As the revert commit will most likely break merging this PR, I hope it will be easy to fix the conflicts as there are not too many changes.