Revert 187767 "Add a unified observer to replace NetworkManagerO..."