diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 6aea113ab51..dce68368e4a 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -1319,12 +1319,6 @@ static void get_nir_shaders(struct si_shader *shader, struct si_linked_shaders *
 
    /* TODO: run linking optimizations here if we have LS+HS or ES+GS */
 
-   /* Remove holes after removed PS inputs by renumbering them. Holes can only occur with
-    * monolithic PS.
-    */
-   if (shader->selector->stage == MESA_SHADER_FRAGMENT && shader->is_monolithic)
-      NIR_PASS(_, linked->consumer.nir, nir_recompute_io_bases, nir_var_shader_in);
-
    for (unsigned i = 0; i < SI_NUM_LINKED_SHADERS; i++) {
       if (linked->shader[i].nir) {
          si_get_shader_variant_info(shader, &linked->shader[i].temp_info, linked->shader[i].nir);
diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c b/src/gallium/drivers/radeonsi/si_shader_nir.c
index 87549949736..9a4c394167a 100644
--- a/src/gallium/drivers/radeonsi/si_shader_nir.c
+++ b/src/gallium/drivers/radeonsi/si_shader_nir.c
@@ -142,9 +142,6 @@ void si_finalize_nir(struct pipe_screen *screen, struct nir_shader *nir,
    NIR_PASS_ASSERT_NO_PROGRESS(nir, nir_opt_intrinsics);
    NIR_PASS_ASSERT_NO_PROGRESS(nir, nir_lower_system_values);
 
-   if (nir->info.stage == MESA_SHADER_FRAGMENT)
-      NIR_PASS(_, nir, nir_recompute_io_bases, nir_var_shader_in);
-
    /* Remove uniforms because those should have been lowered to UBOs already. */
    nir_foreach_variable_with_modes_safe(var, nir, nir_var_uniform) {
       if (!glsl_type_get_image_count(var->type) &&