diff --git a/cogl/cogl/cogl-display-private.h b/cogl/cogl/cogl-display-private.h
index 74dfb8e59..e20036345 100644
--- a/cogl/cogl/cogl-display-private.h
+++ b/cogl/cogl/cogl-display-private.h
@@ -44,10 +44,6 @@ struct _CoglDisplay
   CoglRenderer *renderer;
   CoglOnscreenTemplate *onscreen_template;
 
-#ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT
-  struct wl_display *wayland_compositor_display;
-#endif
-
   void *winsys;
 };
 
diff --git a/cogl/cogl/cogl-display.c b/cogl/cogl/cogl-display.c
index ea5383944..64e9df809 100644
--- a/cogl/cogl/cogl-display.c
+++ b/cogl/cogl/cogl-display.c
@@ -38,9 +38,6 @@
 
 #include "cogl-display-private.h"
 #include "cogl-renderer-private.h"
-#ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT
-#include "cogl-wayland-server.h"
-#endif
 #include "cogl-gtype-private.h"
 #include "winsys/cogl-winsys-private.h"
 
@@ -152,14 +149,3 @@ cogl_display_setup (CoglDisplay *display,
 
   return TRUE;
 }
-
-#ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT
-void
-cogl_wayland_display_set_compositor_display (CoglDisplay *display,
-                                             struct wl_display *wayland_display)
-{
-  g_return_if_fail (display->setup == FALSE);
-
-  display->wayland_compositor_display = wayland_display;
-}
-#endif
diff --git a/cogl/cogl/winsys/cogl-winsys-egl-feature-functions.h b/cogl/cogl/winsys/cogl-winsys-egl-feature-functions.h
index a65586ce1..e10c01938 100644
--- a/cogl/cogl/winsys/cogl-winsys-egl-feature-functions.h
+++ b/cogl/cogl/winsys/cogl-winsys-egl-feature-functions.h
@@ -86,12 +86,6 @@ COGL_WINSYS_FEATURE_BEGIN (bind_wayland_display,
                            "WL\0",
                            "bind_wayland_display\0",
                            COGL_EGL_WINSYS_FEATURE_EGL_IMAGE_FROM_WAYLAND_BUFFER)
-COGL_WINSYS_FEATURE_FUNCTION (EGLImageKHR, eglBindWaylandDisplay,
-                              (EGLDisplay dpy,
-                               struct wl_display *wayland_display))
-COGL_WINSYS_FEATURE_FUNCTION (EGLBoolean, eglUnbindWaylandDisplay,
-                              (EGLDisplay dpy,
-                               struct wl_display *wayland_display))
 COGL_WINSYS_FEATURE_FUNCTION (EGLBoolean, eglQueryWaylandBuffer,
                               (EGLDisplay dpy,
                                struct wl_resource *buffer,
diff --git a/cogl/cogl/winsys/cogl-winsys-egl.c b/cogl/cogl/winsys/cogl-winsys-egl.c
index ed47f5aa5..85409433d 100644
--- a/cogl/cogl/winsys/cogl-winsys-egl.c
+++ b/cogl/cogl/winsys/cogl-winsys-egl.c
@@ -498,18 +498,6 @@ _cogl_winsys_display_setup (CoglDisplay *display,
   egl_display = g_new0 (CoglDisplayEGL, 1);
   display->winsys = egl_display;
 
-#ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT
-  if (display->wayland_compositor_display)
-    {
-      struct wl_display *wayland_display = display->wayland_compositor_display;
-      CoglRendererEGL *egl_renderer = display->renderer->winsys;
-
-      if (egl_renderer->pf_eglBindWaylandDisplay)
-	egl_renderer->pf_eglBindWaylandDisplay (egl_renderer->edpy,
-						wayland_display);
-    }
-#endif
-
   if (egl_renderer->platform_vtable->display_setup &&
       !egl_renderer->platform_vtable->display_setup (display, error))
     goto error;