diff --git a/.pick_status.json b/.pick_status.json
index abcd7751cc4..31d593b0a3a 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -774,7 +774,7 @@
         "description": "Revert \"mesa: check for ARB_ES3_compatibility in format checks\"",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "d5916cb3ca7af90f81639d91922efecf9e713fda",
         "notes": null
diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c
index bb53d989fad..0bc2fe2bf01 100644
--- a/src/mesa/main/glformats.c
+++ b/src/mesa/main/glformats.c
@@ -1821,9 +1821,7 @@ valid_texture_format_enum(const struct gl_context *ctx, GLenum format)
    case GL_LUMINANCE_ALPHA:
    case GL_LUMINANCE:
    case GL_ALPHA:
-      return _mesa_is_desktop_gl_compat(ctx) ||
-             _mesa_has_ARB_ES3_compatibility(ctx) ||
-             _mesa_is_gles(ctx);
+      return _mesa_is_desktop_gl_compat(ctx) || _mesa_is_gles(ctx);
 
    case GL_SRGB_EXT:
    case GL_SRGB_ALPHA_EXT: