diff --git a/.pick_status.json b/.pick_status.json
index fe19e7f0a7e..5fc1d511a01 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -661,7 +661,7 @@
         "description": "util/prim_restart: revert part of bad fix",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "1272c2e05246cad647324ffdccf56435b97dec1c"
     },
diff --git a/src/gallium/auxiliary/util/u_prim_restart.c b/src/gallium/auxiliary/util/u_prim_restart.c
index 9224bb396e3..071bfdc6205 100644
--- a/src/gallium/auxiliary/util/u_prim_restart.c
+++ b/src/gallium/auxiliary/util/u_prim_restart.c
@@ -125,14 +125,13 @@ util_translate_prim_restart_ib(struct pipe_context *context,
    /* Create new index buffer */
    *dst_buffer = pipe_buffer_create(screen, PIPE_BIND_INDEX_BUFFER,
                                     PIPE_USAGE_STREAM,
-                                    (start + count) * dst_index_size);
+                                    count * dst_index_size);
    if (!*dst_buffer)
       goto error;
 
    /* Map new / dest index buffer */
-   dst_map = pipe_buffer_map_range(context, *dst_buffer,
-                                   start * dst_index_size, count * dst_index_size,
-                                   PIPE_MAP_WRITE, &dst_transfer);
+   dst_map = pipe_buffer_map(context, *dst_buffer,
+                             PIPE_MAP_WRITE, &dst_transfer);
    if (!dst_map)
       goto error;