Revert "Merge pull request #133 from EDiLD/dev_ms"

This reverts commit 040896cac74459dd4ee2bcc95b0de23f20ab6a31, reversing
changes made to 657a7add2288d189c599c705655f02a2ca860d1f.
Merge pull request #135 from EDiLD/revert_bad_merge_1

Revert "Merge pull request #133 from EDiLD/dev_ms"