diff --git a/Xi/extinit.c b/Xi/extinit.c
index 37005c4b26..31774b71c5 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -364,7 +364,7 @@ SProcIDispatch(ClientPtr client)
         case X_SelectExtensionEvent:
             return ProcXSelectExtensionEvent(client);
         case X_GetSelectedExtensionEvents:
-            return SProcXGetSelectedExtensionEvents(client);
+            return ProcXGetSelectedExtensionEvents(client);
         case X_ChangeDeviceDontPropagateList:
             return ProcXChangeDeviceDontPropagateList(client);
         case X_GetDeviceDontPropagateList:
diff --git a/Xi/getselev.c b/Xi/getselev.c
index 9d5c426884..a348e0fd2b 100644
--- a/Xi/getselev.c
+++ b/Xi/getselev.c
@@ -66,21 +66,6 @@ SOFTWARE.
 #include "swaprep.h"
 #include "getprop.h"
 
-/***********************************************************************
- *
- * This procedure gets the current selected extension events.
- *
- */
-
-int _X_COLD
-SProcXGetSelectedExtensionEvents(ClientPtr client)
-{
-    REQUEST(xGetSelectedExtensionEventsReq);
-    REQUEST_SIZE_MATCH(xGetSelectedExtensionEventsReq);
-    swapl(&stuff->window);
-    return (ProcXGetSelectedExtensionEvents(client));
-}
-
 /***********************************************************************
  *
  * This procedure gets the current device select mask,
@@ -91,6 +76,12 @@ SProcXGetSelectedExtensionEvents(ClientPtr client)
 int
 ProcXGetSelectedExtensionEvents(ClientPtr client)
 {
+    REQUEST(xGetSelectedExtensionEventsReq);
+    REQUEST_SIZE_MATCH(xGetSelectedExtensionEventsReq);
+
+    if (client->swapped)
+        swapl(&stuff->window);
+
     int i, rc = 0;
     WindowPtr pWin;
     XEventClass *buf = NULL;
@@ -99,9 +90,6 @@ ProcXGetSelectedExtensionEvents(ClientPtr client)
     OtherInputMasks *pOthers;
     InputClientsPtr others;
 
-    REQUEST(xGetSelectedExtensionEventsReq);
-    REQUEST_SIZE_MATCH(xGetSelectedExtensionEventsReq);
-
     xGetSelectedExtensionEventsReply rep = {
         .RepType = X_GetSelectedExtensionEvents,
     };
diff --git a/Xi/handlers.h b/Xi/handlers.h
index 30a3a023cd..511f0e8ba6 100644
--- a/Xi/handlers.h
+++ b/Xi/handlers.h
@@ -72,7 +72,6 @@ int ProcXUngrabDeviceKey(ClientPtr client);
 int SProcXGetDeviceDontPropagateList(ClientPtr  client);
 int SProcXGetDeviceMotionEvents(ClientPtr client);
 int SProcXGetExtensionVersion(ClientPtr client);
-int SProcXGetSelectedExtensionEvents(ClientPtr client);
 int SProcXIAllowEvents(ClientPtr client);
 int SProcXIBarrierReleasePointer(ClientPtr client);
 int SProcXIGetClientPointer(ClientPtr client);