video: msm: phase 2 (revert a bit, was too new)