diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index ce45abfaf7c..1c3a6ca3d48 100644
--- a/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@ -5243,9 +5243,6 @@ typedef struct {
    /* Lower image_atomic(_swap) for all dimensions. Implied by lower_image. */
    bool lower_image_atomic;
 
-   /* Subtract one from the UBO index */
-   bool skip_ubo_0;
-
    /* Vulkan's robustBufferAccess feature is only concerned with buffers that
     * are bound through descriptor sets, so shared memory is not included, but
     * it may be useful to enable this for debugging.
diff --git a/src/compiler/nir/nir_lower_robust_access.c b/src/compiler/nir/nir_lower_robust_access.c
index 5dce3a6d72e..bd8595ffbe6 100644
--- a/src/compiler/nir/nir_lower_robust_access.c
+++ b/src/compiler/nir/nir_lower_robust_access.c
@@ -68,9 +68,6 @@ lower_buffer_load(nir_builder *b,
    nir_ssa_def *index = instr->src[0].ssa;
 
    if (instr->intrinsic == nir_intrinsic_load_ubo) {
-      if (opts->skip_ubo_0)
-         index = nir_iadd_imm(b, index, -1);
-
       size = nir_get_ubo_size(b, 32, index);
    } else {
       size = nir_get_ssbo_size(b, index);