Revert "[NetworkSetup] update..."

This reverts commit f49085400c42c6bbdaf75b1c26039caecb5aacde.