msm: revert back last commit
msm: revert back last commit