Revert "Port network mode toggle from CM10"

This reverts commit b85c393fed4b4356c6f0a52284bf398c03ddc454.