diff --git a/.pick_status.json b/.pick_status.json
index 6b332584e1e..df31256d44d 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -5734,7 +5734,7 @@
         "description": "Revert \"glthread: mark internal bufferobjs for the ctx they belong to\"",
         "nominated": true,
         "nomination_type": 3,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "45b6aa1eb7ce0b3845567be7ee4349ab55f30043",
         "notes": null
diff --git a/src/mesa/main/glthread_bufferobj.c b/src/mesa/main/glthread_bufferobj.c
index a92ca40a860..09b0fbebbbc 100644
--- a/src/mesa/main/glthread_bufferobj.c
+++ b/src/mesa/main/glthread_bufferobj.c
@@ -25,8 +25,6 @@
 #include "dispatch.h"
 #include "main/bufferobj.h"
 
-#define PRIVATE_REFCOUNT 1000000
-
 /**
  * Create an upload buffer. This is called from the app thread, so everything
  * has to be thread-safe in the driver.
@@ -81,11 +79,6 @@ _mesa_glthread_release_upload_buffer(struct gl_context *ctx, bool async_release)
                    -glthread->upload_buffer_private_refcount);
       glthread->upload_buffer_private_refcount = 0;
    }
-   if (glthread->upload_buffer) {
-      glthread->upload_buffer->Ctx = NULL;
-      p_atomic_add(&glthread->upload_buffer->RefCount,
-                   -(PRIVATE_REFCOUNT - glthread->upload_buffer->CtxRefCount));
-   }
 
    if (async_release) {
       /* Defer to avoid calling tc_resource_release from this thread. */
@@ -163,8 +156,6 @@ _mesa_glthread_upload(struct gl_context *ctx, const void *data,
        */
       glthread->upload_buffer->RefCount += default_size;
       glthread->upload_buffer_private_refcount = default_size;
-      glthread->upload_buffer->Ctx = ctx;
-      glthread->upload_buffer->CtxRefCount = PRIVATE_REFCOUNT;
    }
 
    /* Upload data. */