diff --git a/extra/io/unix/sockets/sockets.factor b/extra/io/unix/sockets/sockets.factor
index c9fc9905a8..741e10f7a6 100755
--- a/extra/io/unix/sockets/sockets.factor
+++ b/extra/io/unix/sockets/sockets.factor
@@ -71,10 +71,7 @@ TUPLE: accept-task < input-task ;
     dup <c-object> [ swap heap-size <int> accept ] keep ; inline
 
 : do-accept ( port fd sockaddr -- )
-    rot
-    [ server-port-addr parse-sockaddr ] keep
-    [ set-server-port-client-addr ] keep
-    set-server-port-client ;
+  swapd over addr>> parse-sockaddr >>client-addr (>>client) ;
 
 M: accept-task do-io-task
     io-task-port dup accept-sockaddr