diff --git a/zebra/zserv.c b/zebra/zserv.c
index 47eb49a..10616b4 100644
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -1374,10 +1374,14 @@
     }
 
   /* Make client socket non-blocking.  */
-
+  /* XXX: We dont requeue failed writes, so this leads to inconsistencies.
+   * for now socket must remain blocking, regardless of risk of deadlocks.
+   */
+  /*
   val = fcntl (client_sock, F_GETFL, 0);
   fcntl (client_sock, F_SETFL, (val | O_NONBLOCK));
-
+  */
+  
   /* Create new zebra client. */
   zebra_client_create (client_sock);