diff --git a/Xi/extinit.c b/Xi/extinit.c
index bcc82034f..38415f64d 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -370,7 +370,7 @@ SProcIDispatch(ClientPtr client)
         case X_GetDeviceDontPropagateList:
             return ProcXGetDeviceDontPropagateList(client);
         case X_GetDeviceMotionEvents:
-            return SProcXGetDeviceMotionEvents(client);
+            return ProcXGetDeviceMotionEvents(client);
         case X_ChangeKeyboardDevice:
             return ProcXChangeKeyboardDevice(client);
         case X_ChangePointerDevice:
diff --git a/Xi/gtmotion.c b/Xi/gtmotion.c
index 75b072571..f876ae400 100644
--- a/Xi/gtmotion.c
+++ b/Xi/gtmotion.c
@@ -63,22 +63,6 @@ SOFTWARE.
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 
-/***********************************************************************
- *
- * Swap the request if server and client have different byte ordering.
- *
- */
-
-int _X_COLD
-SProcXGetDeviceMotionEvents(ClientPtr client)
-{
-    REQUEST(xGetDeviceMotionEventsReq);
-    REQUEST_SIZE_MATCH(xGetDeviceMotionEventsReq);
-    swapl(&stuff->start);
-    swapl(&stuff->stop);
-    return (ProcXGetDeviceMotionEvents(client));
-}
-
 /****************************************************************************
  *
  * Get the motion history for an extension pointer devices.
@@ -91,6 +75,11 @@ ProcXGetDeviceMotionEvents(ClientPtr client)
     REQUEST(xGetDeviceMotionEventsReq);
     REQUEST_SIZE_MATCH(xGetDeviceMotionEventsReq);
 
+    if (client->swapped) {
+        swapl(&stuff->start);
+        swapl(&stuff->stop);
+    }
+
     DeviceIntPtr dev;
     int rc = dixLookupDevice(&dev, stuff->deviceid, client, DixReadAccess);
     if (rc != Success)
diff --git a/Xi/handlers.h b/Xi/handlers.h
index 0b29bcc4f..c6311dd5c 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 SProcXGetDeviceMotionEvents(ClientPtr client);
 int SProcXIAllowEvents(ClientPtr client);
 int SProcXIBarrierReleasePointer(ClientPtr client);
 int SProcXIGetClientPointer(ClientPtr client);