diff --git a/hw/xwayland/xwayland-glamor-gbm.c b/hw/xwayland/xwayland-glamor-gbm.c
index e3c5bb581..a62412b7b 100644
--- a/hw/xwayland/xwayland-glamor-gbm.c
+++ b/hw/xwayland/xwayland-glamor-gbm.c
@@ -1306,6 +1306,4 @@ xwl_glamor_init_gbm(struct xwl_screen *xwl_screen)
                   xwl_gbm);
 
     xwl_screen->gbm_backend.is_available = TRUE;
-    xwl_screen->gbm_backend.backend_flags = XWL_EGL_BACKEND_NEEDS_BUFFER_FLUSH |
-                                            XWL_EGL_BACKEND_NEEDS_N_BUFFERING;
 }
diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
index 16f862896..5020551d3 100644
--- a/hw/xwayland/xwayland-glamor.c
+++ b/hw/xwayland/xwayland-glamor.c
@@ -300,19 +300,13 @@ xwl_glamor_needs_buffer_flush(struct xwl_screen *xwl_screen)
     if (!xwl_screen->glamor || !xwl_screen->egl_backend)
         return FALSE;
 
-    return (xwl_screen->egl_backend->backend_flags &
-                XWL_EGL_BACKEND_NEEDS_BUFFER_FLUSH);
+    return TRUE;
 }
 
 Bool
 xwl_glamor_needs_n_buffering(struct xwl_screen *xwl_screen)
 {
-    /* wl_shm benefits from n-buffering */
-    if (!xwl_screen->glamor || !xwl_screen->egl_backend)
-        return TRUE;
-
-    return (xwl_screen->egl_backend->backend_flags &
-                XWL_EGL_BACKEND_NEEDS_N_BUFFERING);
+    return TRUE;
 }
 
 void