Revert "Merge pull request #122 from joakim-hove/MSW-130"

This reverts commit 9cb95a450bc36bf516c8cefd4dc7991c7d8fc393, reversing
changes made to 66a082d0287e94d7ca90864d750cb3f8a3e22dc8.
Revert "Merge pull request #121 from joakim-hove/MSW-130"

This reverts commit 66a082d0287e94d7ca90864d750cb3f8a3e22dc8, reversing
changes made to 4e08c388b63b4172de63909dc53ff50c5514c46b.
Merge pull request #126 from joakim-hove/upstream-master-undo-MSW

Upstream master undo msw