diff --git a/src/components/main/compositing/compositor.rs b/src/components/main/compositing/compositor.rs
index c16e5a64001..261ab4b411e 100644
--- a/src/components/main/compositing/compositor.rs
+++ b/src/components/main/compositing/compositor.rs
@@ -381,13 +381,7 @@ impl IOCompositor {
                                                           self.opts.cpu_painting);
             new_layer.unrendered_color = unrendered_color;
 
-            let first_child = self.root_layer.first_child.borrow().clone();
-            match first_child {
-                None => {}
-                Some(old_layer) => {
-                    ContainerLayer::remove_child(self.root_layer.clone(), old_layer)
-                }
-            }
+            self.root_layer.remove_all_children();
 
             assert!(new_layer.add_child_if_necessary(self.root_layer.clone(),
                                                      root_pipeline_id,
diff --git a/src/support/layers/rust-layers b/src/support/layers/rust-layers
index 29a0f4c3629..261bef5849b 160000
--- a/src/support/layers/rust-layers
+++ b/src/support/layers/rust-layers
@@ -1 +1 @@
-Subproject commit 29a0f4c36292314671778631e336aa845276c733
+Subproject commit 261bef5849b817df2288f2f7dac5fe8f255a04ab