Revert "Protou"

This reverts commit a3b72cb94e98cc737c438f093bb85637e21cf61e.
mach-msm: Update from Protou