diff --git a/rutabaga_gfx/src/rutabaga_core.rs b/rutabaga_gfx/src/rutabaga_core.rs
index 7374ab0f10..8cfc2ff623 100644
--- a/rutabaga_gfx/src/rutabaga_core.rs
+++ b/rutabaga_gfx/src/rutabaga_core.rs
@@ -210,7 +210,7 @@ struct RutabagaCapsetInfo {
     pub name: &'static str,
 }
 
-const RUTABAGA_CAPSETS: [RutabagaCapsetInfo; 7] = [
+const RUTABAGA_CAPSETS: [RutabagaCapsetInfo; 6] = [
     RutabagaCapsetInfo {
         capset_id: RUTABAGA_CAPSET_VIRGL,
         component: RutabagaComponentType::VirglRenderer,
@@ -236,11 +236,6 @@ const RUTABAGA_CAPSETS: [RutabagaCapsetInfo; 7] = [
         component: RutabagaComponentType::CrossDomain,
         name: "cross-domain",
     },
-    RutabagaCapsetInfo {
-        capset_id: 30,
-        component: RutabagaComponentType::CrossDomain,
-        name: "minigbm-cross-domain",
-    },
     RutabagaCapsetInfo {
         capset_id: RUTABAGA_CAPSET_DRM,
         component: RutabagaComponentType::VirglRenderer,
@@ -256,13 +251,6 @@ pub fn calculate_context_mask(context_names: Vec<String>) -> u64 {
         };
     });
 
-    // TODO remove once
-    // https://android-review.googlesource.com/c/platform/external/minigbm/+/2101455
-    // is picked back to rvc-arc branch:
-    if context_mask & (1 << RUTABAGA_CAPSET_DRM) != 0 {
-        context_mask |= 1 << 30;
-    }
-
     context_mask
 }
 
@@ -964,7 +952,6 @@ impl RutabagaBuilder {
             let cross_domain = CrossDomain::init(self.channels)?;
             rutabaga_components.insert(RutabagaComponentType::CrossDomain, cross_domain);
             push_capset(RUTABAGA_CAPSET_CROSS_DOMAIN);
-            push_capset(30);
         }
 
         Ok(Rutabaga {