Revert "Changes for the 2g and lte toggles"

This reverts commit eddd259af94f75bf3473bcf8cd0bb5e2dc3ca3a8.