diff --git a/Xi/extinit.c b/Xi/extinit.c
index 31774b71c5..715901436e 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -368,7 +368,7 @@ SProcIDispatch(ClientPtr client)
         case X_ChangeDeviceDontPropagateList:
             return ProcXChangeDeviceDontPropagateList(client);
         case X_GetDeviceDontPropagateList:
-            return SProcXGetDeviceDontPropagateList(client);
+            return ProcXGetDeviceDontPropagateList(client);
         case X_GetDeviceMotionEvents:
             return SProcXGetDeviceMotionEvents(client);
         case X_ChangeKeyboardDevice:
diff --git a/Xi/getprop.c b/Xi/getprop.c
index 47e558b088..7838840ec4 100644
--- a/Xi/getprop.c
+++ b/Xi/getprop.c
@@ -68,21 +68,6 @@ SOFTWARE.
 extern XExtEventInfo EventInfo[];
 extern int ExtEventIndex;
 
-/***********************************************************************
- *
- * Handle a request from a client with a different byte order.
- *
- */
-
-int _X_COLD
-SProcXGetDeviceDontPropagateList(ClientPtr client)
-{
-    REQUEST(xGetDeviceDontPropagateListReq);
-    REQUEST_SIZE_MATCH(xGetDeviceDontPropagateListReq);
-    swapl(&stuff->window);
-    return (ProcXGetDeviceDontPropagateList(client));
-}
-
 /***********************************************************************
  *
  * This procedure lists the input devices available to the server.
@@ -92,15 +77,18 @@ SProcXGetDeviceDontPropagateList(ClientPtr client)
 int
 ProcXGetDeviceDontPropagateList(ClientPtr client)
 {
+    REQUEST(xGetDeviceDontPropagateListReq);
+    REQUEST_SIZE_MATCH(xGetDeviceDontPropagateListReq);
+
+    if (client->swapped)
+        swapl(&stuff->window);
+
     CARD16 count = 0;
     int i, rc;
     XEventClass *buf = NULL, *tbuf;
     WindowPtr pWin;
     OtherInputMasks *others;
 
-    REQUEST(xGetDeviceDontPropagateListReq);
-    REQUEST_SIZE_MATCH(xGetDeviceDontPropagateListReq);
-
     xGetDeviceDontPropagateListReply rep = {
         .RepType = X_GetDeviceDontPropagateList,
     };
diff --git a/Xi/handlers.h b/Xi/handlers.h
index 511f0e8ba6..053455daf1 100644
--- a/Xi/handlers.h
+++ b/Xi/handlers.h
@@ -69,7 +69,6 @@ int ProcXUngrabDeviceButton(ClientPtr client);
 int ProcXUngrabDevice(ClientPtr client);
 int ProcXUngrabDeviceKey(ClientPtr client);
 
-int SProcXGetDeviceDontPropagateList(ClientPtr  client);
 int SProcXGetDeviceMotionEvents(ClientPtr client);
 int SProcXGetExtensionVersion(ClientPtr client);
 int SProcXIAllowEvents(ClientPtr client);