Preparing to swap to NetworkManager