diff --git a/src/gallium/targets/libgl-xlib/libgl-xlib.sym b/src/gallium/targets/libgl-xlib/libgl-xlib.sym
index 446d8d29238..529213809ba 100644
--- a/src/gallium/targets/libgl-xlib/libgl-xlib.sym
+++ b/src/gallium/targets/libgl-xlib/libgl-xlib.sym
@@ -1,6 +1,5 @@
 {
 	global:
-                _mesa_glapi_Dispatch;
                 _mesa_glapi_tls_Dispatch;
                 _mesa_glapi_get_dispatch_table_size; # only for tests
                 _mesa_glapi_get_proc_offset; # only for tests
diff --git a/src/mapi/glapi/glapi.h b/src/mapi/glapi/glapi.h
index 9bdfbb5f4f7..e173635931e 100644
--- a/src/mapi/glapi/glapi.h
+++ b/src/mapi/glapi/glapi.h
@@ -77,8 +77,6 @@ _GLAPI_EXPORT extern __THREAD_INITIAL_EXEC struct _glapi_table * _mesa_glapi_tls
 _GLAPI_EXPORT extern __THREAD_INITIAL_EXEC void * _mesa_glapi_tls_Context;
 #endif
 
-_GLAPI_EXPORT extern const struct _glapi_table *_mesa_glapi_Dispatch;
-
 #if DETECT_OS_WINDOWS && !defined(MAPI_MODE_SHARED_GLAPI)
 # define GET_DISPATCH() _mesa_glapi_get_dispatch()
 # define GET_CURRENT_CONTEXT(C)  struct gl_context *C = (struct gl_context *) _mesa_glapi_get_context()
diff --git a/src/mapi/shared-glapi/core.c b/src/mapi/shared-glapi/core.c
index a1040de53fe..1bbf64fda06 100644
--- a/src/mapi/shared-glapi/core.c
+++ b/src/mapi/shared-glapi/core.c
@@ -172,26 +172,10 @@ entry_get_public(int slot)
 
 #endif /* asm */
 
-/**
- * \name Current dispatch and current context control variables
- *
- * Depending on whether or not multithreading is support, and the type of
- * support available, several variables are used to store the current context
- * pointer and the current dispatch table pointer. In the non-threaded case,
- * the variables \c _mesa_glapi_Dispatch and \c _glapi_Context are used for this
- * purpose.
- *
- * In multi threaded case, The TLS variables \c _mesa_glapi_tls_Dispatch and
- * \c _mesa_glapi_tls_Context are used. Having \c _mesa_glapi_Dispatch
- * be hardcoded to \c NULL maintains binary compatability between TLS enabled
- * loaders and non-TLS DRI drivers. When \c _mesa_glapi_Dispatch
- * are \c NULL, the thread state data \c ContextTSD are used.
- */
-
+/* Current dispatch and current context variables */
 __THREAD_INITIAL_EXEC struct _glapi_table *_mesa_glapi_tls_Dispatch
    = (struct _glapi_table *)table_noop_array;
 __THREAD_INITIAL_EXEC void *_mesa_glapi_tls_Context;
-const struct _glapi_table *_mesa_glapi_Dispatch;
 
 static int
 stub_compare(const void *key, const void *elem)