diff --git a/Xext/dpms.c b/Xext/dpms.c
index 8ac73d819..629094705 100644
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -495,8 +495,6 @@ static int _X_COLD
 SProcDPMSGetVersion(ClientPtr client)
 {
     REQUEST(xDPMSGetVersionReq);
-
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xDPMSGetVersionReq);
     swaps(&stuff->majorVersion);
     swaps(&stuff->minorVersion);
@@ -506,22 +504,12 @@ SProcDPMSGetVersion(ClientPtr client)
 static int _X_COLD
 SProcDPMSCapable(ClientPtr client)
 {
-    REQUEST(xDPMSCapableReq);
-
-    swaps(&stuff->length);
-    REQUEST_SIZE_MATCH(xDPMSCapableReq);
-
     return ProcDPMSCapable(client);
 }
 
 static int _X_COLD
 SProcDPMSGetTimeouts(ClientPtr client)
 {
-    REQUEST(xDPMSGetTimeoutsReq);
-
-    swaps(&stuff->length);
-    REQUEST_SIZE_MATCH(xDPMSGetTimeoutsReq);
-
     return ProcDPMSGetTimeouts(client);
 }
 
@@ -529,8 +517,6 @@ static int _X_COLD
 SProcDPMSSetTimeouts(ClientPtr client)
 {
     REQUEST(xDPMSSetTimeoutsReq);
-
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xDPMSSetTimeoutsReq);
 
     swaps(&stuff->standby);
@@ -542,22 +528,12 @@ SProcDPMSSetTimeouts(ClientPtr client)
 static int _X_COLD
 SProcDPMSEnable(ClientPtr client)
 {
-    REQUEST(xDPMSEnableReq);
-
-    swaps(&stuff->length);
-    REQUEST_SIZE_MATCH(xDPMSEnableReq);
-
     return ProcDPMSEnable(client);
 }
 
 static int _X_COLD
 SProcDPMSDisable(ClientPtr client)
 {
-    REQUEST(xDPMSDisableReq);
-
-    swaps(&stuff->length);
-    REQUEST_SIZE_MATCH(xDPMSDisableReq);
-
     return ProcDPMSDisable(client);
 }
 
@@ -565,8 +541,6 @@ static int _X_COLD
 SProcDPMSForceLevel(ClientPtr client)
 {
     REQUEST(xDPMSForceLevelReq);
-
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xDPMSForceLevelReq);
 
     swaps(&stuff->level);
@@ -577,11 +551,6 @@ SProcDPMSForceLevel(ClientPtr client)
 static int _X_COLD
 SProcDPMSInfo(ClientPtr client)
 {
-    REQUEST(xDPMSInfoReq);
-
-    swaps(&stuff->length);
-    REQUEST_SIZE_MATCH(xDPMSInfoReq);
-
     return ProcDPMSInfo(client);
 }
 
@@ -589,7 +558,6 @@ static int _X_COLD
 SProcDPMSSelectInput(ClientPtr client)
 {
     REQUEST(xDPMSSelectInputReq);
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xDPMSSelectInputReq);
     swapl(&stuff->eventMask);
     return ProcDPMSSelectInput(client);