diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c
index b74544cad..139ad484d 100644
--- a/hw/xfree86/dri/xf86dri.c
+++ b/hw/xfree86/dri/xf86dri.c
@@ -562,8 +562,6 @@ ProcXF86DRIDispatch(register ClientPtr client)
 static int _X_COLD
 SProcXF86DRIQueryVersion(register ClientPtr client)
 {
-    REQUEST(xXF86DRIQueryVersionReq);
-    swaps(&stuff->length);
     return ProcXF86DRIQueryVersion(client);
 }
 
@@ -572,7 +570,6 @@ SProcXF86DRIQueryDirectRenderingCapable(register ClientPtr client)
 {
     REQUEST(xXF86DRIQueryDirectRenderingCapableReq);
     REQUEST_SIZE_MATCH(xXF86DRIQueryDirectRenderingCapableReq);
-    swaps(&stuff->length);
     swapl(&stuff->screen);
     return ProcXF86DRIQueryDirectRenderingCapable(client);
 }
diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c
index 586caeab2..b1d604a9e 100644
--- a/hw/xfree86/dri2/dri2ext.c
+++ b/hw/xfree86/dri2/dri2ext.c
@@ -75,7 +75,6 @@ validDrawable(ClientPtr client, XID drawable, Mask access_mode,
 static int
 ProcDRI2QueryVersion(ClientPtr client)
 {
-    REQUEST(xDRI2QueryVersionReq);
     xDRI2QueryVersionReply rep = {
         .type = X_Reply,
         .sequenceNumber = client->sequence,
@@ -84,9 +83,6 @@ ProcDRI2QueryVersion(ClientPtr client)
         .minorVersion = dri2_minor
     };
 
-    if (client->swapped)
-        swaps(&stuff->length);
-
     REQUEST_SIZE_MATCH(xDRI2QueryVersionReq);
 
     if (client->swapped) {
@@ -651,7 +647,6 @@ SProcDRI2Connect(ClientPtr client)
 
     /* If the client is swapped, it's not local.  Talk to the hand. */
 
-    swaps(&stuff->length);
     if (sizeof(*stuff) / 4 != client->req_len)
         return BadLength;