diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 958ac8cb8f0..cf46e1d124b 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -408,10 +408,7 @@ one_time_init( struct gl_context *ctx )
        * unecessary creation/destruction of glsl types.
        */
       glsl_type_singleton_init_or_ref();
-   }
 
-   /* per-API one-time init */
-   if (!(api_init_mask & (1 << ctx->API))) {
       _mesa_init_remap_table();
    }