Get Phone number / MMS working again

We still need to use some of our own specific items.....for now
Revert "vigor: phone doesn't know it's phone number. "

This reverts commit 0f4f2bba3cf0235d557047a9efc41b7fcf58f87f.