Revert "Use legacy MMS"

This reverts commit a38cedce0f283cd0c906bc4d4b2a6161ce3230d5.