diff --git a/.pick_status.json b/.pick_status.json
index 18c694a112f..c4400fcd31d 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1874,7 +1874,7 @@
         "description": "glsl: fix regression in ubo cloning",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "2b2132d2acd1fc312de41813888b802aeda3a00a",
         "notes": null
diff --git a/src/compiler/nir/nir_linking_helpers.c b/src/compiler/nir/nir_linking_helpers.c
index 73bc317ad4b..14298416022 100644
--- a/src/compiler/nir/nir_linking_helpers.c
+++ b/src/compiler/nir/nir_linking_helpers.c
@@ -1172,8 +1172,9 @@ nir_clone_uniform_variable(nir_shader *nir, nir_variable *uniform, bool spirv)
       if ((spirv && uniform->data.mode & nir_var_mem_ubo &&
            v->data.binding == uniform->data.binding) ||
           (!spirv &&
-           ((!strcmp(uniform->name, v->name) && !uniform->data.explicit_binding && !v->data.explicit_binding) ||
-            (uniform->data.explicit_binding && v->data.explicit_binding && v->data.binding == uniform->data.binding)))) {
+           (!strcmp(uniform->name, v->name) &&
+            uniform->data.explicit_binding == v->data.explicit_binding &&
+            uniform->data.binding == v->data.binding))) {
          new_var = v;
          break;
       }