diff --git a/Xi/extinit.c b/Xi/extinit.c
index bd4df3d78..1aba852eb 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_XIQueryVersion)
-        SRepXIQueryVersion(client, len, (xXIQueryVersionReply *) rep);
-    else if (rep->RepType == X_XIQueryDevice)
+    if (rep->RepType == X_XIQueryDevice)
         SRepXIQueryDevice(client, len, (xXIQueryDeviceReply *) rep);
     else if (rep->RepType == X_XIGrabDevice)
         SRepXIGrabDevice(client, len, (xXIGrabDeviceReply *) rep);
diff --git a/Xi/xiqueryversion.c b/Xi/xiqueryversion.c
index c897c2ee1..44aa68264 100644
--- a/Xi/xiqueryversion.c
+++ b/Xi/xiqueryversion.c
@@ -116,12 +116,16 @@ ProcXIQueryVersion(ClientPtr client)
         .repType = X_Reply,
         .RepType = X_XIQueryVersion,
         .sequenceNumber = client->sequence,
-        .length = 0,
         .major_version = major,
         .minor_version = minor
     };
 
-    WriteReplyToClient(client, sizeof(xXIQueryVersionReply), &rep);
+    if (client->swapped) {
+        swaps(&rep.sequenceNumber);
+        swaps(&rep.major_version);
+        swaps(&rep.minor_version);
+    }
+    WriteToClient(client, sizeof(xXIQueryVersionReply), &rep);
 
     return Success;
 }
@@ -137,13 +141,3 @@ SProcXIQueryVersion(ClientPtr client)
     swaps(&stuff->minor_version);
     return (ProcXIQueryVersion(client));
 }
-
-void _X_COLD
-SRepXIQueryVersion(ClientPtr client, int size, xXIQueryVersionReply * rep)
-{
-    swaps(&rep->sequenceNumber);
-    swapl(&rep->length);
-    swaps(&rep->major_version);
-    swaps(&rep->minor_version);
-    WriteToClient(client, size, rep);
-}
diff --git a/Xi/xiqueryversion.h b/Xi/xiqueryversion.h
index 6dcedacc0..824e168a4 100644
--- a/Xi/xiqueryversion.h
+++ b/Xi/xiqueryversion.h
@@ -35,6 +35,5 @@
 
 int SProcXIQueryVersion(ClientPtr client);
 int ProcXIQueryVersion(ClientPtr client);
-void SRepXIQueryVersion(ClientPtr client, int size, xXIQueryVersionReply * rep);
 
 #endif                          /* QUERYVERSION_H */