Revert "Fix master/pool logic of network states"

This reverts commit 79edb304a7d9bf9047d63f136aacdb1f8c76cd85.

Change-Id: I1e47615b62134b951a4ea5995f99d2440623936a
8 files changed