Revert msm: 5b646d7d1b1d3f95c6b51f75215e0f5d4c592e66 and sync: f95313eae1bcdc18cc9c3478f345c6538a0342a5