Revert "mach-msm: Update from Protou"

This reverts commit 1821460d9fc7b610ab8438f8446867da561d60e0.
mach-msm: Update from Protou