Revert "back to old msm config stable 1/2"

This reverts commit 8d09ce510f38799080cef1ff4063200d7fc16db3.