Add back in old networking/rpc/admin code