diff --git a/Xi/extinit.c b/Xi/extinit.c
index cf6d1950e..df6762e4e 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -421,9 +421,7 @@ SReplyIDispatch(ClientPtr client, int len, xGrabDeviceReply * rep)
 {
     /* All we look at is the type field */
     /* This is common to all replies    */
-    if (rep->RepType == X_XIPassiveGrabDevice)
-        SRepXIPassiveGrabDevice(client, len, (xXIPassiveGrabDeviceReply *) rep);
-    else if (rep->RepType == X_XIListProperties)
+    if (rep->RepType == X_XIListProperties)
         SRepXIListProperties(client, len, (xXIListPropertiesReply *) rep);
     else if (rep->RepType == X_XIGetProperty)
         SRepXIGetProperty(client, len, (xXIGetPropertyReply *) rep);
diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c
index c72a002e1..2eb8820aa 100644
--- a/Xi/xipassivegrab.c
+++ b/Xi/xipassivegrab.c
@@ -92,7 +92,6 @@ ProcXIPassiveGrabDevice(ClientPtr client)
     GrabParameters param;
     void *tmp;
     int mask_len;
-    uint32_t length;
 
     REQUEST(xXIPassiveGrabDeviceReq);
     REQUEST_FIXED_SIZE(xXIPassiveGrabDeviceReq,
@@ -247,11 +246,15 @@ ProcXIPassiveGrabDevice(ClientPtr client)
         }
     }
 
-    /* save the value before SRepXIPassiveGrabDevice swaps it */
-    length = rep.length;
-    WriteReplyToClient(client, sizeof(rep), &rep);
-    if (rep.num_modifiers)
-        WriteToClient(client, length * 4, modifiers_failed);
+    uint32_t length = rep.length; /* save it before swapping */
+
+    if (client->swapped) {
+        swaps(&rep.sequenceNumber);
+        swapl(&rep.length);
+        swaps(&rep.num_modifiers);
+    }
+    WriteToClient(client, sizeof(rep), &rep);
+    WriteToClient(client, length * 4, modifiers_failed);
 
  out:
     free(modifiers_failed);
@@ -259,17 +262,6 @@ ProcXIPassiveGrabDevice(ClientPtr client)
     return ret;
 }
 
-void _X_COLD
-SRepXIPassiveGrabDevice(ClientPtr client, int size,
-                        xXIPassiveGrabDeviceReply * rep)
-{
-    swaps(&rep->sequenceNumber);
-    swapl(&rep->length);
-    swaps(&rep->num_modifiers);
-
-    WriteToClient(client, size, rep);
-}
-
 int _X_COLD
 SProcXIPassiveUngrabDevice(ClientPtr client)
 {
diff --git a/Xi/xipassivegrab.h b/Xi/xipassivegrab.h
index c790bb779..de59ab990 100644
--- a/Xi/xipassivegrab.h
+++ b/Xi/xipassivegrab.h
@@ -32,8 +32,6 @@
 
 int SProcXIPassiveUngrabDevice(ClientPtr client);
 int ProcXIPassiveUngrabDevice(ClientPtr client);
-void SRepXIPassiveGrabDevice(ClientPtr client, int size,
-                             xXIPassiveGrabDeviceReply * rep);
 int ProcXIPassiveGrabDevice(ClientPtr client);
 int SProcXIPassiveGrabDevice(ClientPtr client);