diff --git a/.pick_status.json b/.pick_status.json
index 291735cf36d..0e2d7aa8297 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -409,7 +409,7 @@
         "description": "Revert \"nir: Preserve offsets in lower_io_to_scalar_early\"",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "a1bc1523408a305b14a8c297ea93a28bb12cee5d"
     },
diff --git a/src/compiler/nir/nir_lower_io_to_scalar.c b/src/compiler/nir/nir_lower_io_to_scalar.c
index 25153d39bdb..12c6a7a46f3 100644
--- a/src/compiler/nir/nir_lower_io_to_scalar.c
+++ b/src/compiler/nir/nir_lower_io_to_scalar.c
@@ -341,10 +341,6 @@ lower_load_to_scalar_early(nir_builder *b, nir_intrinsic_instr *intr,
          chan_var = nir_variable_clone(var, b->shader);
          chan_var->data.location_frac =  var->data.location_frac + i;
          chan_var->type = glsl_channel_type(chan_var->type);
-         if (var->data.explicit_offset) {
-            unsigned comp_size = glsl_get_bit_size(chan_var->type) / 8;
-            chan_var->data.offset = var->data.offset + i * comp_size;
-         }
 
          chan_vars[var->data.location_frac + i] = chan_var;
 
@@ -399,10 +395,6 @@ lower_store_output_to_scalar_early(nir_builder *b, nir_intrinsic_instr *intr,
          chan_var = nir_variable_clone(var, b->shader);
          chan_var->data.location_frac =  var->data.location_frac + i;
          chan_var->type = glsl_channel_type(chan_var->type);
-         if (var->data.explicit_offset) {
-            unsigned comp_size = glsl_get_bit_size(chan_var->type) / 8;
-            chan_var->data.offset = var->data.offset + i * comp_size;
-         }
 
          chan_vars[var->data.location_frac + i] = chan_var;