diff --git a/render/render.c b/render/render.c
index 530d91c606..b104440ae0 100644
--- a/render/render.c
+++ b/render/render.c
@@ -113,7 +113,6 @@ static int SProcRenderCompositeGlyphs(ClientPtr pClient);
 static int SProcRenderFillRectangles(ClientPtr pClient);
 static int SProcRenderSetPictureTransform(ClientPtr pClient);
 static int SProcRenderSetPictureFilter(ClientPtr pClient);
-static int SProcRenderCreateAnimCursor(ClientPtr pClient);
 static int SProcRenderAddTraps(ClientPtr pClient);
 static int SProcRenderCreateSolidFill(ClientPtr pClient);
 static int SProcRenderCreateLinearGradient(ClientPtr pClient);
@@ -192,7 +191,7 @@ int (*SProcRenderVector[RenderNumberRequests]) (ClientPtr) = {
         SProcRenderSetPictureTransform,
         ProcRenderQueryFilters,
         SProcRenderSetPictureFilter,
-        SProcRenderCreateAnimCursor,
+        ProcRenderCreateAnimCursor,
         SProcRenderAddTraps,
         SProcRenderCreateSolidFill,
         SProcRenderCreateLinearGradient,
@@ -1723,13 +1722,19 @@ static int
 ProcRenderCreateAnimCursor(ClientPtr client)
 {
     REQUEST(xRenderCreateAnimCursorReq);
+    REQUEST_AT_LEAST_SIZE(xRenderCreateAnimCursorReq);
+
+    if (client->swapped) {
+        swapl(&stuff->cid);
+        SwapRestL(stuff);
+    }
+
     CARD32 *deltas;
     CursorPtr pCursor;
     xAnimCursorElt *elt;
     int i;
     int ret;
 
-    REQUEST_AT_LEAST_SIZE(xRenderCreateAnimCursorReq);
     LEGAL_NEW_RESOURCE(stuff->cid, client);
     if (client->req_len & 1)
         return BadLength;
@@ -2253,17 +2258,6 @@ SProcRenderSetPictureFilter(ClientPtr client)
     return ProcRenderSetPictureFilter(client);
 }
 
-static int _X_COLD
-SProcRenderCreateAnimCursor(ClientPtr client)
-{
-    REQUEST(xRenderCreateAnimCursorReq);
-    REQUEST_AT_LEAST_SIZE(xRenderCreateAnimCursorReq);
-
-    swapl(&stuff->cid);
-    SwapRestL(stuff);
-    return ProcRenderCreateAnimCursor(client);
-}
-
 static int _X_COLD
 SProcRenderAddTraps(ClientPtr client)
 {