Revert "mms to us"

This reverts commit 48a9794ea8b05931621fd805753c2aaf51255e02.

Conflicts:
	default.xml

Change-Id: Ia946db0e6c8dc076018f89ad93bd8f404fc699a6