diff --git a/gst/vaapi/gstvaapipluginbase.c b/gst/vaapi/gstvaapipluginbase.c
index 5fde56c4fe..18c3576754 100644
--- a/gst/vaapi/gstvaapipluginbase.c
+++ b/gst/vaapi/gstvaapipluginbase.c
@@ -60,21 +60,6 @@ plugin_set_display (GstVaapiPluginBase * plugin, GstVaapiDisplay * display)
   gst_vaapi_display_unref (display);
 }
 
-#if USE_GST_GL_HELPERS
-static void
-plugin_set_gst_gl (GstVaapiPluginBase * plugin, GstGLDisplay * gl_display,
-    GstGLContext * gl_context, GstGLContext * gl_other_context)
-{
-  gst_object_replace (&plugin->gl_display, NULL);
-  plugin->gl_display = (GstObject *) gl_display;
-
-  gst_object_replace (&plugin->gl_context, (GstObject *) gl_context);
-
-  gst_object_replace (&plugin->gl_other_context, NULL);
-  plugin->gl_other_context = (GstObject *) gl_other_context;
-}
-#endif
-
 /**
  * gst_vaapi_plugin_base_set_context:
  * @plugin: a #GstVaapiPluginBase instance
@@ -99,14 +84,9 @@ gst_vaapi_plugin_base_set_context (GstVaapiPluginBase * plugin,
     plugin_set_display (plugin, display);
   }
 #if USE_GST_GL_HELPERS
-  {
-    GstGLDisplay *gl_display = NULL;
-    GstGLContext *gl_other_context = NULL;
-    GstElement *el = GST_ELEMENT_CAST (plugin);
-
-    if (gst_gl_handle_set_context (el, context, &gl_display, &gl_other_context))
-      plugin_set_gst_gl (plugin, gl_display, NULL, gl_other_context);
-  }
+  gst_gl_handle_set_context (GST_ELEMENT_CAST (plugin), context,
+      (GstGLDisplay **) & plugin->gl_display,
+      (GstGLContext **) & plugin->gl_other_context);
 #endif
 }