diff --git a/Xi/extinit.c b/Xi/extinit.c
index 3ebb061dc..9fe82a0a6 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -421,10 +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_GetExtensionVersion)
-        SRepXGetExtensionVersion(client, len,
-                                 (xGetExtensionVersionReply *) rep);
-    else if (rep->RepType == X_ListInputDevices)
+    if (rep->RepType == X_ListInputDevices)
         SRepXListInputDevices(client, len, (xListInputDevicesReply *) rep);
     else if (rep->RepType == X_OpenDevice)
         SRepXOpenDevice(client, len, (xOpenDeviceReply *) rep);
diff --git a/Xi/getvers.c b/Xi/getvers.c
index 47c27e673..f1c243880 100644
--- a/Xi/getvers.c
+++ b/Xi/getvers.c
@@ -103,25 +103,14 @@ ProcXGetExtensionVersion(ClientPtr client)
         .present = TRUE
     };
 
-    WriteReplyToClient(client, sizeof(xGetExtensionVersionReply), &rep);
+    if (client->swapped) {
+        swaps(&rep.sequenceNumber);
+        swapl(&rep.length);
+        swaps(&rep.major_version);
+        swaps(&rep.minor_version);
+    }
+
+    WriteToClient(client, sizeof(xGetExtensionVersionReply), &rep);
 
     return Success;
 }
-
-/***********************************************************************
- *
- * This procedure writes the reply for the XGetExtensionVersion function,
- * if the client and server have a different byte ordering.
- *
- */
-
-void _X_COLD
-SRepXGetExtensionVersion(ClientPtr client, int size,
-                         xGetExtensionVersionReply * rep)
-{
-    swaps(&rep->sequenceNumber);
-    swapl(&rep->length);
-    swaps(&rep->major_version);
-    swaps(&rep->minor_version);
-    WriteToClient(client, size, rep);
-}
diff --git a/Xi/getvers.h b/Xi/getvers.h
index 11fec4b06..678046d1d 100644
--- a/Xi/getvers.h
+++ b/Xi/getvers.h
@@ -36,9 +36,4 @@ int SProcXGetExtensionVersion(ClientPtr /* client */
 int ProcXGetExtensionVersion(ClientPtr  /* client */
     );
 
-void SRepXGetExtensionVersion(ClientPtr /* client */ ,
-                              int /* size */ ,
-                              xGetExtensionVersionReply *       /* rep */
-    );
-
 #endif                          /* GETVERS_H */