diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 35076122afd5a0f8f26bdcd302177504dc44c41e..7bc5e03e089c02cd02d6d63c50325d8326ba44a1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,7 @@ build-sysext:
 
 stages:
   - pre_review
-  - prep
+# - prep
   - review
   - build
   - test
@@ -140,11 +140,11 @@ check-merge-request:
     reports:
       junit: check-merge-request-report.xml
 
-build-fedora-container:
-  extends:
-    - .fdo.container-build@fedora@x86_64
-    - .gnome-shell.fedora
-  stage: prep
+#build-fedora-container:
+#  extends:
+#    - .fdo.container-build@fedora@x86_64
+#    - .gnome-shell.fedora
+#  stage: prep
 
 js_check:
   extends:
diff --git a/src/st/st-theme-node-drawing.c b/src/st/st-theme-node-drawing.c
index 395f179b60fd1fec63aaa5b1208831e7b1ce225d..95b4c6566321719fc3d49d3ffee82a67e9cfbb1d 100644
--- a/src/st/st-theme-node-drawing.c
+++ b/src/st/st-theme-node-drawing.c
@@ -2516,23 +2516,23 @@ st_theme_node_prerender_shadow (StThemeNodePaintState *state,
                               state->resource_scale,
                               state->resource_scale, 1);
 
+      color_state = clutter_paint_context_get_color_state (paint_context);
+
       cogl_color_init_from_4f (&clear_color, 0, 0, 0, 0);
       root_node = clutter_root_node_new (framebuffer,
+                                         color_state,
                                          &clear_color,
                                          COGL_BUFFER_BIT_COLOR);
 
       st_theme_node_paint_borders (state, root_node, &box,
                                    ST_PAINT_BORDERS_MODE_SILHOUETTE, 0xff);
 
-      color_state = clutter_paint_context_get_color_state (paint_context);
       nested_paint_context =
         clutter_paint_context_new_for_framebuffer (framebuffer,
                                                    NULL,
                                                    CLUTTER_PAINT_FLAG_NONE,
                                                    color_state);
-      clutter_paint_context_push_color_state (nested_paint_context, color_state);
       clutter_paint_node_paint (root_node, nested_paint_context);
-      clutter_paint_context_pop_color_state (nested_paint_context);
       clutter_paint_context_destroy (nested_paint_context);
 
       state->box_shadow_pipeline = _st_create_shadow_pipeline (st_theme_node_get_box_shadow (node),