Revert "Merge pull request #9358 from lodr/bug-864798-change-mnc-mcc-wit...

...h-strings"

This reverts commit 4461830f907e8f87ff13ddb31aabec4726530306, reversing
changes made to 610a684aad80f4d1a4576b5dc1e42dfaba055346.

*** JUST A TEST ***