Revert "Port network mode toggle from CM10"

This reverts commit 11a024e908e1f0f975e269e8d7d2e2b93d31d2f1.