--- clutter/cogl/clutter-backend-cogl.c.bak	2011-07-21 22:26:17.324707070 +0200
+++ clutter/cogl/clutter-backend-cogl.c	2011-07-21 22:26:46.829707440 +0200
@@ -347,10 +347,6 @@
   if (!backend->cogl_context)
     goto error;
 
-  /* XXX: eventually this should go away but a lot of Cogl code still
-   * depends on a global default context. */
-  cogl_set_default_context (backend->cogl_context);
-
   return TRUE;
 
 error: