Revert mserv

Sryderrequested to merge
revert-mserv into master

From my understanding, is the fix for the Master Server issues on Windows.

Merge request reports