Revert "msm-3.4"

This reverts commit 4a3bfe7e74a15c5b1e3ea8e84800c2f483b5f0c0.