diff --git a/Xi/extinit.c b/Xi/extinit.c
index 93d3b0f04..bd4df3d78 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_XIGetClientPointer)
-        SRepXIGetClientPointer(client, len, (xXIGetClientPointerReply *) rep);
-    else if (rep->RepType == X_XIQueryVersion)
+    if (rep->RepType == X_XIQueryVersion)
         SRepXIQueryVersion(client, len, (xXIQueryVersionReply *) rep);
     else if (rep->RepType == X_XIQueryDevice)
         SRepXIQueryDevice(client, len, (xXIQueryDeviceReply *) rep);
diff --git a/Xi/xigetclientpointer.c b/Xi/xigetclientpointer.c
index c047ab7d1..2ae469d30 100644
--- a/Xi/xigetclientpointer.c
+++ b/Xi/xigetclientpointer.c
@@ -83,23 +83,11 @@ ProcXIGetClientPointer(ClientPtr client)
         .deviceid = (winclient->clientPtr) ? winclient->clientPtr->id : 0
     };
 
-    WriteReplyToClient(client, sizeof(xXIGetClientPointerReply), &rep);
+    if (client->swapped) {
+        swaps(&rep.sequenceNumber);
+        swapl(&rep.length);
+        swaps(&rep.deviceid);
+    }
+    WriteToClient(client, sizeof(xXIGetClientPointerReply), &rep);
     return Success;
 }
-
-/***********************************************************************
- *
- * This procedure writes the reply for the XGetClientPointer function,
- * if the client and server have a different byte ordering.
- *
- */
-
-void _X_COLD
-SRepXIGetClientPointer(ClientPtr client, int size,
-                       xXIGetClientPointerReply * rep)
-{
-    swaps(&rep->sequenceNumber);
-    swapl(&rep->length);
-    swaps(&rep->deviceid);
-    WriteToClient(client, size, rep);
-}
diff --git a/Xi/xigetclientpointer.h b/Xi/xigetclientpointer.h
index 4ecf42cca..2e3cfc330 100644
--- a/Xi/xigetclientpointer.h
+++ b/Xi/xigetclientpointer.h
@@ -29,10 +29,8 @@
 
 #ifndef GETCPTR_H
 #define GETCPTR_H 1
+
 int SProcXIGetClientPointer(ClientPtr /* client */ );
 int ProcXIGetClientPointer(ClientPtr /* client */ );
-void SRepXIGetClientPointer(ClientPtr /* client */ ,
-                            int /* size */ ,
-                            xXIGetClientPointerReply * /* rep */ );
 
 #endif                          /* GETCPTR_H */