Revert "MMS: Fix lookup of vanity addresses"

This reverts commit 7e9562e74ffb08cae2036f7de293783a45cc470f

Change-Id: I6606b2898c2744470e9626b5e762e0c158181ae3