Revert previous commit and add back test of MMS disposition removal

Change-Id: Ifea24718180e9cf307ccc2aeb817bb8c2b563091