diff --git a/Xi/extinit.c b/Xi/extinit.c
index a9e95c6a3..93d3b0f04 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_XIQueryPointer)
-        SRepXIQueryPointer(client, len, (xXIQueryPointerReply *) rep);
-    else if (rep->RepType == X_XIGetClientPointer)
+    if (rep->RepType == X_XIGetClientPointer)
         SRepXIGetClientPointer(client, len, (xXIGetClientPointerReply *) rep);
     else if (rep->RepType == X_XIQueryVersion)
         SRepXIQueryVersion(client, len, (xXIQueryVersionReply *) rep);
diff --git a/Xi/xiquerypointer.c b/Xi/xiquerypointer.c
index 0451692ca..4bb6ae360 100644
--- a/Xi/xiquerypointer.c
+++ b/Xi/xiquerypointer.c
@@ -195,34 +195,21 @@ ProcXIQueryPointer(ClientPtr client)
     }
 #endif /* XINERAMA */
 
-    WriteReplyToClient(client, sizeof(xXIQueryPointerReply), &rep);
-    if (buttons)
-        WriteToClient(client, buttons_size, buttons);
+    if (client->swapped) {
+        swaps(&rep.sequenceNumber);
+        swapl(&rep.length);
+        swapl(&rep.root);
+        swapl(&rep.child);
+        swapl(&rep.root_x);
+        swapl(&rep.root_y);
+        swapl(&rep.win_x);
+        swapl(&rep.win_y);
+        swaps(&rep.buttons_len);
+    }
+    WriteToClient(client, sizeof(xXIQueryPointerReply), &rep);
+    WriteToClient(client, buttons_size, buttons);
 
     free(buttons);
 
     return Success;
 }
-
-/***********************************************************************
- *
- * This procedure writes the reply for the XIQueryPointer function,
- * if the client and server have a different byte ordering.
- *
- */
-
-void
-SRepXIQueryPointer(ClientPtr client, int size, xXIQueryPointerReply * rep)
-{
-    swaps(&rep->sequenceNumber);
-    swapl(&rep->length);
-    swapl(&rep->root);
-    swapl(&rep->child);
-    swapl(&rep->root_x);
-    swapl(&rep->root_y);
-    swapl(&rep->win_x);
-    swapl(&rep->win_y);
-    swaps(&rep->buttons_len);
-
-    WriteToClient(client, size, rep);
-}
diff --git a/Xi/xiquerypointer.h b/Xi/xiquerypointer.h
index a6bc4ce95..f4dfacc4f 100644
--- a/Xi/xiquerypointer.h
+++ b/Xi/xiquerypointer.h
@@ -32,8 +32,5 @@
 
 int SProcXIQueryPointer(ClientPtr /* client */ );
 int ProcXIQueryPointer(ClientPtr /* client */ );
-void SRepXIQueryPointer(ClientPtr /* client */ ,
-                        int /* size */ ,
-                        xXIQueryPointerReply * /* rep */ );
 
 #endif                          /* QUERYDP_H */