diff --git a/Xi/extinit.c b/Xi/extinit.c
index 058218905..ecb55da42 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -153,7 +153,6 @@ const Mask DevicePropertyNotifyMask = (1L << 19);
 const Mask XIAllMasks = (1L << 20) - 1;
 
 int ExtEventIndex;
-Mask ExtExclusiveMasks[EMASKSIZE];
 
 static struct dev_type {
     Atom type;
@@ -951,23 +950,6 @@ SetEventInfo(Mask mask, int constant)
     EventInfo[ExtEventIndex++].type = constant;
 }
 
-/**************************************************************************
- *
- * Allow the specified event to be restricted to being selected by one
- * client at a time.
- * The default is to allow more than one client to select the event.
- *
- */
-
-static void
-SetExclusiveAccess(Mask mask)
-{
-    int i;
-
-    for (i = 0; i < MAXDEVICES; i++)
-        ExtExclusiveMasks[i] |= mask;
-}
-
 /**************************************************************************
  *
  * Assign the specified mask to the specified event.
@@ -1069,8 +1051,6 @@ FixExtensionEvents(ExtensionEntry * extEntry)
     SetMaskForExtEvent(ChangeDeviceNotifyMask, ChangeDeviceNotify);
 
     SetEventInfo(DeviceButtonGrabMask, _deviceButtonGrab);
-    SetExclusiveAccess(DeviceButtonGrabMask);
-
     SetEventInfo(DeviceOwnerGrabButtonMask, _deviceOwnerGrabButton);
     SetEventInfo(DevicePresenceNotifyMask, _devicePresence);
     SetMaskForExtEvent(DevicePropertyNotifyMask, DevicePropertyNotify);
diff --git a/Xi/selectev.c b/Xi/selectev.c
index b9b8112aa..65c7bc868 100644
--- a/Xi/selectev.c
+++ b/Xi/selectev.c
@@ -65,8 +65,6 @@ SOFTWARE.
 #include "grabdev.h"
 #include "selectev.h"
 
-extern Mask ExtExclusiveMasks[];
-
 static int
 HandleDevicePresenceMask(ClientPtr client, WindowPtr win,
                          XEventClass * cls, CARD16 *count)
@@ -175,7 +173,7 @@ ProcXSelectExtensionEvent(ClientPtr client)
             }
             if ((ret =
                  SelectForWindow((DeviceIntPtr) tmp[i].dev, pWin, client,
-                                 tmp[i].mask, ExtExclusiveMasks[i])) != Success)
+                                 tmp[i].mask, DeviceButtonGrabMask)) != Success)
                 return ret;
         }