diff --git a/src/core/events.c b/src/core/events.c
index 43015ad2d..342503664 100644
--- a/src/core/events.c
+++ b/src/core/events.c
@@ -1620,8 +1620,6 @@ handle_other_xevent (MetaDisplay *display,
     case SelectionNotify:
       break;
     case ColormapNotify:
-      if (window && !frame_was_receiver)
-        window->colormap = event->xcolormap.colormap;
       break;
     case ClientMessage:
       if (window)
diff --git a/src/core/frame.c b/src/core/frame.c
index e54e86210..350493c59 100644
--- a/src/core/frame.c
+++ b/src/core/frame.c
@@ -35,8 +35,7 @@
                     ButtonPressMask | ButtonReleaseMask |          \
                     PointerMotionMask | PointerMotionHintMask |    \
                     EnterWindowMask | LeaveWindowMask |            \
-                    FocusChangeMask |                              \
-                    ColormapChangeMask)
+                    FocusChangeMask)
 
 void
 meta_window_ensure_frame (MetaWindow *window)
diff --git a/src/core/window-private.h b/src/core/window-private.h
index 97b052cbb..ebda724b9 100644
--- a/src/core/window-private.h
+++ b/src/core/window-private.h
@@ -103,7 +103,6 @@ struct _MetaWindow
   MetaFrame *frame;
   int depth;
   Visual *xvisual;
-  Colormap colormap;
   char *desc; /* used in debug spew */
   char *title;
 
diff --git a/src/core/window.c b/src/core/window.c
index 9c30162ce..1f9796443 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -833,7 +833,6 @@ _meta_window_shared_new (MetaDisplay         *display,
 
   window->depth = attrs->depth;
   window->xvisual = attrs->visual;
-  window->colormap = attrs->colormap;
 
   window->title = NULL;
   window->icon = NULL;
diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
index 54b25fc00..339f4ac18 100644
--- a/src/x11/window-x11.c
+++ b/src/x11/window-x11.c
@@ -2322,7 +2322,7 @@ meta_window_x11_new (MetaDisplay       *display,
 
   meta_error_trap_push_with_return (display);
 
-  event_mask = PropertyChangeMask | ColormapChangeMask;
+  event_mask = PropertyChangeMask;
   if (attrs.override_redirect)
     event_mask |= StructureNotifyMask;