diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index 887c242f68e..210d0785c63 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -585,8 +585,6 @@ const __DRIimageLookupExtension image_lookup_extension = {
 };
 
 static const struct dri_extension_match dri3_driver_extensions[] = {
-   {__DRI_IMAGE_DRIVER, 2, offsetof(struct dri2_egl_display, image_driver),
-    false},
    {__DRI_CONFIG_OPTIONS, 2, offsetof(struct dri2_egl_display, configOptions),
     true},
 };
@@ -743,7 +741,6 @@ dri2_setup_screen(_EGLDisplay *disp)
    if ((api_mask & (1 << __DRI_API_GLES3)) && _eglIsApiValid(EGL_OPENGL_ES_API))
       disp->ClientAPIs |= EGL_OPENGL_ES3_BIT_KHR;
 
-   assert(dri2_dpy->image_driver || dri2_dpy->dri2 || dri2_dpy->kopper || dri2_dpy->swrast);
    disp->Extensions.KHR_create_context = EGL_TRUE;
    disp->Extensions.KHR_create_context_no_error = EGL_TRUE;
    disp->Extensions.KHR_no_config_context = EGL_TRUE;
diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h
index 92503662bca..f1157828dd3 100644
--- a/src/egl/drivers/dri2/egl_dri2.h
+++ b/src/egl/drivers/dri2/egl_dri2.h
@@ -242,7 +242,6 @@ struct dri2_egl_display {
    __DRIscreen *dri_screen_display_gpu;
    bool own_dri_screen;
    const __DRIconfig **driver_configs;
-   const __DRIimageDriverExtension *image_driver;
    const __DRIdri2Extension *dri2;
    const __DRI2flushExtension *flush;
    const __DRI2flushControlExtension *flush_control;
diff --git a/src/egl/drivers/dri2/platform_drm.c b/src/egl/drivers/dri2/platform_drm.c
index f80431fe6c2..635ef2672b5 100644
--- a/src/egl/drivers/dri2/platform_drm.c
+++ b/src/egl/drivers/dri2/platform_drm.c
@@ -645,7 +645,6 @@ dri2_initialize_drm(_EGLDisplay *disp)
    }
 
    dri2_dpy->dri_screen_render_gpu = dri2_dpy->gbm_dri->screen;
-   dri2_dpy->image_driver = dri2_dpy->gbm_dri->image_driver;
    dri2_dpy->driver_configs = dri2_dpy->gbm_dri->driver_configs;
 
    dri2_dpy->gbm_dri->validate_image = dri2_validate_egl_image;
diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c
index 963906265d1..d5dfbe142ef 100644
--- a/src/gbm/backends/dri/gbm_dri.c
+++ b/src/gbm/backends/dri/gbm_dri.c
@@ -236,10 +236,6 @@ static struct dri_extension_match dri_core_extensions[] = {
    { __DRI_IMAGE, 6, offsetof(struct gbm_dri_device, image), false },
 };
 
-static struct dri_extension_match gbm_dri_device_extensions[] = {
-   { __DRI_IMAGE_DRIVER, 2, offsetof(struct gbm_dri_device, image_driver), false },
-};
-
 const __DRIextension **
 dri_loader_get_extensions(const char *driver_name);
 
@@ -271,22 +267,8 @@ dri_screen_create_for_driver(struct gbm_dri_device *dri, char *driver_name, bool
       goto fail;
    }
 
-   bool bind_ok;
-   if (!swrast) {
-      bind_ok = loader_bind_extensions(dri, gbm_dri_device_extensions,
-                                       ARRAY_SIZE(gbm_dri_device_extensions),
-                                       extensions);
-   } else {
-      bind_ok = true;
-   }
-
    dri->swrast = swrast;
 
-   if (!bind_ok) {
-      fprintf(stderr, "failed to bind extensions\n");
-      goto fail;
-   }
-
    dri->driver_extensions = extensions;
    dri->loader_extensions = gbm_dri_screen_extensions;
    dri->screen = driCreateNewScreen3(0, swrast ? -1 : dri->base.v0.fd,
diff --git a/src/gbm/backends/dri/gbm_driint.h b/src/gbm/backends/dri/gbm_driint.h
index 422f6db0855..fba57285b80 100644
--- a/src/gbm/backends/dri/gbm_driint.h
+++ b/src/gbm/backends/dri/gbm_driint.h
@@ -58,7 +58,6 @@ struct gbm_dri_device {
    mtx_t mutex;
 
    const __DRIimageExtension  *image;
-   const __DRIimageDriverExtension  *image_driver;
    const __DRI2flushExtension *flush;
 
    const __DRIconfig   **driver_configs;