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

This reverts commit dd7ac8a6d1a4e9c692523d0f5054d7724e4ba4c2.