diff --git a/.pick_status.json b/.pick_status.json
index 2b43213182e..17a1b5b2497 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4894,7 +4894,7 @@
         "description": "anv: don't use pipeline layout at descriptor bind",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/intel/vulkan/anv_cmd_buffer.c b/src/intel/vulkan/anv_cmd_buffer.c
index 95be41cd07a..180791a2439 100644
--- a/src/intel/vulkan/anv_cmd_buffer.c
+++ b/src/intel/vulkan/anv_cmd_buffer.c
@@ -786,8 +786,7 @@ anv_cmd_buffer_bind_descriptor_set(struct anv_cmd_buffer *cmd_buffer,
     */
    assert(!set->pool || !set->pool->host_only);
 
-   struct anv_descriptor_set_layout *set_layout =
-      layout ? layout->set[set_index].layout: set->layout;
+   struct anv_descriptor_set_layout *set_layout = set->layout;
 
    anv_cmd_buffer_maybe_dirty_descriptor_mode(
       cmd_buffer,