diff --git a/.pick_status.json b/.pick_status.json
index 31d593b0a3a..71300a39198 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -764,7 +764,7 @@
         "description": "mesa/main: remove unused array",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "37190ad932a8e7e67c69343249e895313790ef7b",
         "notes": null
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 60a90e06758..5ecd950f27b 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1004,13 +1004,6 @@ _mesa_initialize_context(struct gl_context *ctx,
 
    _mesa_reset_vertex_processing_mode(ctx);
 
-   /* Mesa core handles all the formats that mesa core knows about.
-    * Drivers will want to override this list with just the formats
-    * they can handle.
-    */
-   memset(&ctx->TextureFormatSupported, GL_TRUE,
-          sizeof(ctx->TextureFormatSupported));
-
    switch (ctx->API) {
    case API_OPENGL_COMPAT:
    case API_OPENGL_CORE:
diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c
index 0bc2fe2bf01..022d47aa763 100644
--- a/src/mesa/main/glformats.c
+++ b/src/mesa/main/glformats.c
@@ -4176,7 +4176,7 @@ _mesa_tex_format_from_format_and_type(const struct gl_context *ctx,
    if (_mesa_format_is_mesa_array_format(format))
       format = _mesa_format_from_array_format(format);
       
-   if (format == MESA_FORMAT_NONE || !ctx->TextureFormatSupported[format])
+   if (format == MESA_FORMAT_NONE)
       return MESA_FORMAT_NONE;
 
    return format;
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 66d890cb89d..8f11a60f8e9 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -3582,8 +3582,6 @@ struct gl_context
     */
    GLboolean HasConfig;
 
-   GLboolean TextureFormatSupported[MESA_FORMAT_COUNT];
-
    GLboolean RasterDiscard;  /**< GL_RASTERIZER_DISCARD */
    GLboolean IntelConservativeRasterization; /**< GL_CONSERVATIVE_RASTERIZATION_INTEL */
    GLboolean ConservativeRasterization; /**< GL_CONSERVATIVE_RASTERIZATION_NV */