diff --git a/Xext/geext.c b/Xext/geext.c
index 7c4eaece6..2cb31d86e 100644
--- a/Xext/geext.c
+++ b/Xext/geext.c
@@ -67,16 +67,12 @@ static void SGEGenericEvent(xEvent *from, xEvent *to);
 static int
 ProcGEQueryVersion(ClientPtr client)
 {
+    X_REQUEST_HEAD_STRUCT(xGEQueryVersionReq);
+    X_REQUEST_FIELD_CARD16(majorVersion);
+    X_REQUEST_FIELD_CARD16(minorVersion);
+
     GEClientInfoPtr pGEClient = GEGetClient(client);
 
-    REQUEST(xGEQueryVersionReq);
-    REQUEST_SIZE_MATCH(xGEQueryVersionReq);
-
-    if (client->swapped) {
-        swaps(&stuff->majorVersion);
-        swaps(&stuff->minorVersion);
-    }
-
     xGEQueryVersionReply reply = {
         .RepType = X_GEQueryVersion,
         /* return the supported version by the server */