diff --git a/.pick_status.json b/.pick_status.json
index ae1950c978d..68e8b024cf1 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -922,7 +922,7 @@
         "description": "aco: do not flag all blocks WQM to ensure we enter all nested loops in WQM",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "661922f6ac9576fc2077c5d50b53ef7edf9e8a18"
     },
diff --git a/src/amd/compiler/aco_insert_exec_mask.cpp b/src/amd/compiler/aco_insert_exec_mask.cpp
index cc6b1899a1c..8bfd548a3c3 100644
--- a/src/amd/compiler/aco_insert_exec_mask.cpp
+++ b/src/amd/compiler/aco_insert_exec_mask.cpp
@@ -156,8 +156,6 @@ void get_block_needs(wqm_ctx &ctx, exec_ctx &exec_ctx, Block* block)
              * the conditions might be computed outside the nested CF */
             if (ctx.program->blocks[block_idx].kind & block_kind_break)
                mark_block_wqm(ctx, block_idx);
-            /* flag all blocks as WQM to ensure we enter all (nested) loops in WQM */
-            exec_ctx.info[block_idx].block_needs |= WQM;
             block_idx++;
          }
       } else if (ctx.loop && !ctx.wqm) {