Revert "Return: National Data Roaming [3/3]"

This reverts commit 0f33d57754b901363995db659e05da475bc555f7.

Change-Id: I47d05a0e80fe5e812ea087ec1c5b6c17e7d8ae07