diff --git a/Xi/extinit.c b/Xi/extinit.c
index 5f2e313a93..3a91d43c6b 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -446,7 +446,7 @@ SProcIDispatch(ClientPtr client)
         case X_XISelectEvents:
             return SProcXISelectEvents(client);
         case X_XIQueryVersion:
-            return SProcXIQueryVersion(client);
+            return ProcXIQueryVersion(client);
         case X_XIQueryDevice:
             return ProcXIQueryDevice(client);
         case X_XISetFocus:
diff --git a/Xi/handlers.h b/Xi/handlers.h
index 8afab70f3d..df32025a5a 100644
--- a/Xi/handlers.h
+++ b/Xi/handlers.h
@@ -71,7 +71,6 @@ int ProcXUngrabDeviceKey(ClientPtr client);
 
 int SProcXIGetSelectedEvents(ClientPtr client);
 int SProcXIQueryPointer(ClientPtr client);
-int SProcXIQueryVersion(ClientPtr client);
 int SProcXISelectEvents(ClientPtr client);
 int SProcXIWarpPointer(ClientPtr client);
 
diff --git a/Xi/xiqueryversion.c b/Xi/xiqueryversion.c
index 79db704c51..c3ded6b144 100644
--- a/Xi/xiqueryversion.c
+++ b/Xi/xiqueryversion.c
@@ -56,11 +56,16 @@ extern XExtensionVersion XIVersion;     /* defined in getvers.c */
 int
 ProcXIQueryVersion(ClientPtr client)
 {
-    int major, minor;
-
     REQUEST(xXIQueryVersionReq);
     REQUEST_SIZE_MATCH(xXIQueryVersionReq);
 
+    if (client->swapped) {
+        swaps(&stuff->major_version);
+        swaps(&stuff->minor_version);
+    }
+
+    int major, minor;
+
     /* This request only exists after XI2 */
     if (stuff->major_version < 2) {
         client->errorValue = stuff->major_version;
@@ -126,15 +131,3 @@ ProcXIQueryVersion(ClientPtr client)
 
     return X_SEND_REPLY_SIMPLE(client, rep);
 }
-
-/* Swapping routines */
-
-int _X_COLD
-SProcXIQueryVersion(ClientPtr client)
-{
-    REQUEST(xXIQueryVersionReq);
-    REQUEST_AT_LEAST_SIZE(xXIQueryVersionReq);
-    swaps(&stuff->major_version);
-    swaps(&stuff->minor_version);
-    return (ProcXIQueryVersion(client));
-}
diff --git a/test/xi2/protocol-xiqueryversion.c b/test/xi2/protocol-xiqueryversion.c
index 7725f2a8d1..a53a45a058 100644
--- a/test/xi2/protocol-xiqueryversion.c
+++ b/test/xi2/protocol-xiqueryversion.c
@@ -147,7 +147,7 @@ request_XIQueryVersion(int smaj, int smin, int cmaj, int cmin, int error)
     swaps(&request.major_version);
     swaps(&request.minor_version);
 
-    rc = SProcXIQueryVersion(&client);
+    rc = ProcXIQueryVersion(&client);
     assert(rc == error);
 }