diff --git a/src/compiler/glsl/gl_nir_link_uniforms.c b/src/compiler/glsl/gl_nir_link_uniforms.c
index 9f5e8c12af7..8f8df461805 100644
--- a/src/compiler/glsl/gl_nir_link_uniforms.c
+++ b/src/compiler/glsl/gl_nir_link_uniforms.c
@@ -2016,9 +2016,6 @@ gl_nir_link_uniforms(const struct gl_constants *consts,
 
    assert(prog->data->spirv || prog->data->NumUniformStorage == storage_size);
 
-   if (prog->data->spirv)
-      prog->NumUniformRemapTable = state.max_uniform_location;
-
    setup_uniform_remap_tables(consts, prog);
    gl_nir_set_uniform_initializers(consts, prog);
 
diff --git a/src/compiler/glsl/gl_nir_linker.c b/src/compiler/glsl/gl_nir_linker.c
index d6e154ce37f..82b2bd1cdf2 100644
--- a/src/compiler/glsl/gl_nir_linker.c
+++ b/src/compiler/glsl/gl_nir_linker.c
@@ -2844,8 +2844,6 @@ reserve_explicit_locations(struct gl_shader_program *prog,
                       *var_name);
          return -1;
       }
-
-      prog->NumUniformRemapTable += slots;
    }
 
    /* Check if location is already used. */
diff --git a/src/compiler/glsl/serialize.cpp b/src/compiler/glsl/serialize.cpp
index 7b596d6e278..cc2f38386cb 100644
--- a/src/compiler/glsl/serialize.cpp
+++ b/src/compiler/glsl/serialize.cpp
@@ -576,11 +576,9 @@ enum uniform_remap_type
 
 static void
 write_uniform_remap_list(struct blob *metadata,
-                          unsigned num_uniform_remap_table,
                           gl_uniform_storage *uniform_storage,
                           struct list_head *uniform_remap_list)
 {
-   blob_write_uint32(metadata, num_uniform_remap_table);
    blob_write_uint32(metadata, list_length(uniform_remap_list));
 
    list_for_each_entry_safe(struct range_entry, entry, uniform_remap_list, node) {
@@ -646,8 +644,7 @@ static void
 write_uniform_remap_tables(struct blob *metadata,
                            struct gl_shader_program *prog)
 {
-   write_uniform_remap_list(metadata, prog->NumUniformRemapTable,
-                            prog->data->UniformStorage,
+   write_uniform_remap_list(metadata, prog->data->UniformStorage,
                             prog->UniformRemapTable);
 
    for (unsigned i = 0; i < MESA_SHADER_MESH_STAGES; i++) {
@@ -664,13 +661,9 @@ write_uniform_remap_tables(struct blob *metadata,
 static void
 read_uniform_remap_list(struct blob_reader *metadata,
                         struct gl_shader_program *prog,
-                        unsigned *num_entries,
                         struct list_head *remap_list,
                         gl_uniform_storage *uniform_storage)
 {
-   unsigned num = blob_read_uint32(metadata);
-   *num_entries = num;
-
    unsigned num_list_entries = blob_read_uint32(metadata);
 
    for (unsigned i = 0; i < num_list_entries; i++) {
@@ -733,8 +726,7 @@ static void
 read_uniform_remap_tables(struct blob_reader *metadata,
                           struct gl_shader_program *prog)
 {
-   read_uniform_remap_list(metadata, prog, &prog->NumUniformRemapTable,
-                           prog->UniformRemapTable,
+   read_uniform_remap_list(metadata, prog, prog->UniformRemapTable,
                            prog->data->UniformStorage);
 
    for (unsigned i = 0; i < MESA_SHADER_MESH_STAGES; i++) {
diff --git a/src/compiler/glsl/standalone_scaffolding.cpp b/src/compiler/glsl/standalone_scaffolding.cpp
index 48c1ba36d0c..c6d4e89a945 100644
--- a/src/compiler/glsl/standalone_scaffolding.cpp
+++ b/src/compiler/glsl/standalone_scaffolding.cpp
@@ -161,7 +161,6 @@ _mesa_clear_shader_program_data(struct gl_context *ctx,
 
    shProg->data->NumUniformStorage = 0;
    shProg->data->UniformStorage = NULL;
-   shProg->NumUniformRemapTable = 0;
    shProg->UniformRemapTable =
       util_reset_range_remap(shProg->UniformRemapTable);
 
diff --git a/src/mesa/main/shader_types.h b/src/mesa/main/shader_types.h
index 0148384dc7a..97ba97ce0c4 100644
--- a/src/mesa/main/shader_types.h
+++ b/src/mesa/main/shader_types.h
@@ -439,7 +439,6 @@ struct gl_shader_program
     * UniformStorage entries. Arrays will have multiple contiguous slots
     * in the UniformRemapTable, all pointing to the same UniformStorage entry.
     */
-   unsigned NumUniformRemapTable;
    struct list_head *UniformRemapTable;
 
    /**