diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 6b28690ec9f..dbd79e929c9 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -961,7 +961,6 @@ _mesa_initialize_context(struct gl_context *ctx,
       return GL_FALSE;
    }
 
-#if FEATURE_dispatch
    /* setup the API dispatch tables */
    switch (ctx->API) {
 #if FEATURE_GL || FEATURE_ES2
@@ -985,7 +984,6 @@ _mesa_initialize_context(struct gl_context *ctx,
       _mesa_reference_shared_state(ctx, &ctx->Shared, NULL);
       return GL_FALSE;
    }
-#endif
    ctx->CurrentDispatch = ctx->Exec;
 
    ctx->FragmentProgram._MaintainTexEnvProgram
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index b67f046ca6c..3761f0b67ba 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -84,7 +84,6 @@
 #define FEATURE_remap_table               0
 #endif
 
-#define FEATURE_dispatch                  1
 #define FEATURE_texgen                    1
 #define FEATURE_userclip                  1