Revert "Use legacy MMS"

This reverts commit d27f47490ea0d960cb57b64b6be40ab47832e401.