MMS Fixed Hopefully Attempt#1 (revert OMNI changes)

Change-Id: Ibdf43f9be457362f226427fbc17e637c40dae2a6