gproc_dist would crash in surrender()

src/gproc_dist.erl

@@ -734,7 +734,7 @@ surrendered_1(Globs) ->
 		  _ = gproc_lib:ensure_monitor(Pid, g),
 		  ets:insert_new(?TAB, {{Pid,Key}, []}),
                   Acc;
-	     ({{Pid,_}=K, Opts}, Acc) when node(Pid) =/= node() ->
+	     ({{Pid,_}=K, Opts}, Acc) -> % when node(Pid) =/= node() ->
 		     ets:insert(?TAB, {K, Opts}),
 		     Acc;
              ({_, Pid, _} = Obj, Acc) when node(Pid) == node() ->

test/gproc_dist_tests.erl

@@ -33,8 +33,8 @@ dist_test_() ->
 			    rpc:multicall(Ns, application, start, [gproc])),
 	       Ns
        end,
-       fun(Ns) ->
-	       [rpc:call(N, init, stop, []) || N <- Ns]
+       fun(_Ns) ->
+	       ok
        end,
        fun(Ns) ->
 	       {inorder,