diff --git a/Xi/extinit.c b/Xi/extinit.c
index df6762e4e..11cd352af 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_XIListProperties)
-        SRepXIListProperties(client, len, (xXIListPropertiesReply *) rep);
-    else if (rep->RepType == X_XIGetProperty)
+    if (rep->RepType == X_XIGetProperty)
         SRepXIGetProperty(client, len, (xXIGetPropertyReply *) rep);
     else if (rep->RepType == X_XIGetSelectedEvents)
         SRepXIGetSelectedEvents(client, len, (xXIGetSelectedEventsReply *) rep);
diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c
index 43bd12e0f..a007633a2 100644
--- a/Xi/xiproperty.c
+++ b/Xi/xiproperty.c
@@ -1084,7 +1084,12 @@ ProcXIListProperties(ClientPtr client)
         .num_properties = natoms
     };
 
-    WriteReplyToClient(client, sizeof(xXIListPropertiesReply), &rep);
+    if (client->swapped) {
+        swaps(&rep.sequenceNumber);
+        swapl(&rep.length);
+        swaps(&rep.num_properties);
+    }
+    WriteToClient(client, sizeof(xXIListPropertiesReply), &rep);
     if (natoms) {
         client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;
         WriteSwappedDataToClient(client, natoms * sizeof(Atom), atoms);
@@ -1270,16 +1275,6 @@ SProcXIGetProperty(ClientPtr client)
     return (ProcXIGetProperty(client));
 }
 
-void _X_COLD
-SRepXIListProperties(ClientPtr client, int size, xXIListPropertiesReply * rep)
-{
-    swaps(&rep->sequenceNumber);
-    swapl(&rep->length);
-    swaps(&rep->num_properties);
-    /* properties will be swapped later, see ProcXIListProperties */
-    WriteToClient(client, size, rep);
-}
-
 void _X_COLD
 SRepXIGetProperty(ClientPtr client, int size, xXIGetPropertyReply * rep)
 {
diff --git a/Xi/xiproperty.h b/Xi/xiproperty.h
index a24b66c5c..420f4f297 100644
--- a/Xi/xiproperty.h
+++ b/Xi/xiproperty.h
@@ -51,8 +51,6 @@ int SProcXIChangeProperty(ClientPtr client);
 int SProcXIDeleteProperty(ClientPtr client);
 int SProcXIGetProperty(ClientPtr client);
 
-void SRepXIListProperties(ClientPtr client, int size,
-                          xXIListPropertiesReply * rep);
 void SRepXIGetProperty(ClientPtr client, int size, xXIGetPropertyReply * rep);
 
 void XIResetProperties(void);