diff --git a/src/intel/compiler/jay/jay_from_nir.c b/src/intel/compiler/jay/jay_from_nir.c
index 093707c8c55..a3c2e6e18c5 100644
--- a/src/intel/compiler/jay/jay_from_nir.c
+++ b/src/intel/compiler/jay/jay_from_nir.c
@@ -2468,16 +2468,38 @@ setup_fragment_payload(struct nir_to_jay_state *nj, struct payload_builder *p)
     * into even/odd halves. Fix up the offsets and insert copies.
     */
    if (nj->s->dispatch_width == 32) {
-      jay_builder *b = &nj->bld;
       jay_foreach_inst_in_block(nj->after_block, I) {
          if (I->op == JAY_OPCODE_PRELOAD && I->dst.file == GPR) {
             unsigned base = (jay_preload_reg(I) % 2) ? p->offsets[GPR] : 0;
             jay_set_preload_reg(I, base + (jay_preload_reg(I) / 2));
          }
       }
+   }
+}
 
-      b->cursor = jay_before_block(nj->after_block);
-      jay_DESWIZZLE(b, p->offsets[GPR]);
+static void
+jay_insert_payload_swizzle(jay_shader *s)
+{
+   jay_function *func = jay_shader_get_entrypoint(s);
+   jay_builder b = jay_init_builder(func, jay_before_function(func));
+
+   unsigned size = s->payload_gprs;
+   assert(s->partition.blocks[GPR][0].start == 1);
+
+   /* Odd: copy both halves to contiguous pair after payload */
+   for (unsigned i = 0; i < (size / 2); ++i) {
+      jay_DESWIZZLE_ODD(&b, jay_bare_reg(GPR, size + i), jay_bare_reg(GPR, i),
+                        jay_bare_reg(GPR, i + ((size + 1) / 2)), !(size & 1));
+   }
+
+   /* Even: leave the bottom half in place, copy top half. If size=1 (rare
+    * but possible), this would be a no-op move so skip it.
+    */
+   if (size > 1) {
+      for (unsigned i = 0; i < DIV_ROUND_UP(size, 2); ++i) {
+         jay_DESWIZZLE_EVEN(&b, jay_bare_reg(GPR, i),
+                            jay_bare_reg(GPR, (size / 2) + i), size & 1);
+      }
    }
 }
 
@@ -2694,6 +2716,10 @@ jay_compile(const struct intel_device_info *devinfo,
    JAY_PASS(s, jay_insert_fp_mode, nir->info.float_controls_execution_mode,
             nir->info.bit_sizes_float);
 
+   if (s->dispatch_width == 32 && s->stage == MESA_SHADER_FRAGMENT) {
+      JAY_PASS(s, jay_insert_payload_swizzle);
+   }
+
    if (!(jay_debug & JAY_DBG_NOOPT)) {
       /* jay_assign_accumulators uses a conservative liveness analysis for
        * predication, so assign accumulators before predicating for better
diff --git a/src/intel/compiler/jay/jay_lower_post_ra.c b/src/intel/compiler/jay/jay_lower_post_ra.c
index 73a5b5c3dd4..3a773cab6ad 100644
--- a/src/intel/compiler/jay/jay_lower_post_ra.c
+++ b/src/intel/compiler/jay/jay_lower_post_ra.c
@@ -99,30 +99,6 @@ lower(jay_builder *b, jay_inst *I)
       return true;
    }
 
-   case JAY_OPCODE_DESWIZZLE: {
-      unsigned size = jay_deswizzle_size(I);
-      assert(b->shader->partition.blocks[GPR][0].start == 1);
-
-      /* Odd: copy both halves to contiguous pair after payload */
-      for (unsigned i = 0; i < (size / 2); ++i) {
-         jay_DESWIZZLE_ODD(b, jay_bare_reg(GPR, size + i), jay_bare_reg(GPR, i),
-                           jay_bare_reg(GPR, i + ((size + 1) / 2)),
-                           !(size & 1));
-      }
-
-      /* Even: leave the bottom half in place, copy top half. If size=1 (rare
-       * but possible), this would be a no-op move so skip it.
-       */
-      if (size > 1) {
-         for (unsigned i = 0; i < DIV_ROUND_UP(size, 2); ++i) {
-            jay_DESWIZZLE_EVEN(b, jay_bare_reg(GPR, i),
-                               jay_bare_reg(GPR, (size / 2) + i), size & 1);
-         }
-      }
-
-      return true;
-   }
-
    default:
       return false;
    }
diff --git a/src/intel/compiler/jay/jay_opcodes.py b/src/intel/compiler/jay/jay_opcodes.py
index 3321e339e35..479b21481c9 100644
--- a/src/intel/compiler/jay/jay_opcodes.py
+++ b/src/intel/compiler/jay/jay_opcodes.py
@@ -151,7 +151,6 @@ op('send', 4, None, Props.SIDE_EFFECTS, [
 
 op('reloc',   0, 'u32 u64', 0, ['unsigned param', 'unsigned base'])
 op('preload', 0, 'u32',     0, ['unsigned reg'])
-op('deswizzle', 0, 'u32', Props.NO_DEST, ['unsigned size'])
 op('deswizzle_odd', 2, 'f32', 0, ['bool src2_hi'])
 op('deswizzle_even', 1, 'f32', 0, ['bool src_hi'])