diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h
index ad0f37b258a..0b9b3e966da 100644
--- a/src/glx/glxclient.h
+++ b/src/glx/glxclient.h
@@ -270,10 +270,6 @@ struct glx_context
      */
    XID share_xid;
 
-    /**
-     * Screen number.
-     */
-   GLint screen;
    struct glx_screen *psc;
 
     /**
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index ee028f80266..8e12686d750 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -239,7 +239,6 @@ glx_context_init(struct glx_context *gc,
    if (!gc->majorOpcode)
       return False;
 
-   gc->screen = psc->scr;
    gc->psc = psc;
    gc->config = config;
    gc->isDirect = GL_TRUE;
@@ -1481,7 +1480,7 @@ glXQueryContext(Display * dpy, GLXContext ctx_user, int attribute, int *value)
       *value = ctx->config ? ctx->config->visualID : None;
       break;
    case GLX_SCREEN:
-      *value = ctx->screen;
+      *value = ctx->psc->scr;
       break;
    case GLX_FBCONFIG_ID:
       *value = ctx->config ? ctx->config->fbconfigID : None;
diff --git a/src/glx/tests/create_context_unittest.cpp b/src/glx/tests/create_context_unittest.cpp
index f78a0f997d9..f17e805f7ed 100644
--- a/src/glx/tests/create_context_unittest.cpp
+++ b/src/glx/tests/create_context_unittest.cpp
@@ -43,7 +43,6 @@ glx_context_init(struct glx_context *gc,
 		 struct glx_screen *psc, struct glx_config *config)
 {
    gc->majorOpcode = 123;
-   gc->screen = psc->scr;
    gc->psc = psc;
    gc->config = config;
    gc->isDirect = GL_TRUE;
@@ -507,7 +506,7 @@ TEST_F(glXCreateContextAttribARB_test, correct_context_screen_number)
 
    struct glx_context *gc = (struct glx_context *) ctx;
 
-   EXPECT_EQ(7, gc->screen);
+   EXPECT_EQ(7, gc->psc->scr);
 }
 
 TEST_F(glXCreateContextAttribARB_test, correct_context_screen_pointer)
diff --git a/src/glx/tests/fake_glx_screen.h b/src/glx/tests/fake_glx_screen.h
index 8e5c9cfefc6..9d1738d2a4c 100644
--- a/src/glx/tests/fake_glx_screen.h
+++ b/src/glx/tests/fake_glx_screen.h
@@ -74,7 +74,6 @@ public:
 
       this->vtable = &fake_glx_context::vt;
       this->majorOpcode = 123;
-      this->screen = psc->scr;
       this->psc = psc;
       this->config = mode;
       this->isDirect = false;
diff --git a/src/glx/xfont.c b/src/glx/xfont.c
index fdf8f992139..f7f112e34b9 100644
--- a/src/glx/xfont.c
+++ b/src/glx/xfont.c
@@ -231,7 +231,7 @@ DRI_glXUseXFont(struct glx_context *CC, Font font, int first, int count, int lis
    int i;
 
    dpy = CC->currentDpy;
-   screen = CC->screen;
+   screen = CC->psc->scr;
 
    fs = XQueryFont(dpy, font);
    if (!fs) {