Revert "Fix blinking data issue on T-Mobile"

Seems to break 2g data for me, will revisit this later

This reverts commit 5d196b2bc6628af0c52c2628a021fdabeff47464.

Change-Id: I7fc3254cc7bf546439b26d44b2b44d6dfb21efaa