Revert "Fix for data and roaming icons"

This reverts commit e79e4d54.
This patch appears to have other dependencies, and the data/voice
roaming distinction is causing lack of GSM to be intepreted
as roaming in LTE+CDMA models.