Revert "MMS: Fix lookup of vanity addresses"

This reverts commit ee1ca02c993ed3f05d07bd1542301d59a7897e33

Change-Id: I6f11555b57961d653f49733e7a4f3f6f60892e04
Merge branch 'cm-10.1' into martincz