diff --git a/dix/dispatch.c b/dix/dispatch.c
index 0a20764cd..1c78c7220 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -3009,7 +3009,7 @@ ProcLookupColor(ClientPtr client)
                                   &exactRed,
                                   &exactGreen,
                                   &exactBlue)) {
-            xLookupColorReply lcr = {
+            xLookupColorReply rep = {
                 .type = X_Reply,
                 .sequenceNumber = client->sequence,
                 .length = 0,
@@ -3020,10 +3020,19 @@ ProcLookupColor(ClientPtr client)
                 .screenGreen = exactGreen,
                 .screenBlue = exactBlue
             };
-            (*pcmp->pScreen->ResolveColor) (&lcr.screenRed,
-                                            &lcr.screenGreen,
-                                            &lcr.screenBlue, pcmp->pVisual);
-            WriteReplyToClient(client, sizeof(xLookupColorReply), &lcr);
+            (*pcmp->pScreen->ResolveColor) (&rep.screenRed,
+                                            &rep.screenGreen,
+                                            &rep.screenBlue, pcmp->pVisual);
+            if (client->swapped) {
+                swaps(&rep.sequenceNumber);
+                swaps(&rep.exactRed);
+                swaps(&rep.exactGreen);
+                swaps(&rep.exactBlue);
+                swaps(&rep.screenRed);
+                swaps(&rep.screenGreen);
+                swaps(&rep.screenBlue);
+            }
+            WriteToClient(client, sizeof(rep), &rep);
             return Success;
         }
         return BadName;
diff --git a/dix/swaprep.c b/dix/swaprep.c
index 100bf3a00..5c6f535be 100644
--- a/dix/swaprep.c
+++ b/dix/swaprep.c
@@ -310,19 +310,6 @@ SGetFontPathReply(ClientPtr pClient, int size, xGetFontPathReply * pRep)
     WriteToClient(pClient, size, pRep);
 }
 
-void _X_COLD
-SLookupColorReply(ClientPtr pClient, int size, xLookupColorReply * pRep)
-{
-    swaps(&pRep->sequenceNumber);
-    swaps(&pRep->exactRed);
-    swaps(&pRep->exactGreen);
-    swaps(&pRep->exactBlue);
-    swaps(&pRep->screenRed);
-    swaps(&pRep->screenGreen);
-    swaps(&pRep->screenBlue);
-    WriteToClient(pClient, size, pRep);
-}
-
 void _X_COLD
 SQueryBestSizeReply(ClientPtr pClient, int size, xQueryBestSizeReply * pRep)
 {
diff --git a/dix/tables.c b/dix/tables.c
index 2f519cd38..609d3a8e3 100644
--- a/dix/tables.c
+++ b/dix/tables.c
@@ -807,7 +807,7 @@ ReplySwapPtr ReplySwapVector[256] = {
     ReplyNotSwappd,
     ReplyNotSwappd,                             /* 90 */
     ReplyNotSwappd,
-    (ReplySwapPtr) SLookupColorReply,
+    ReplyNotSwappd,
     ReplyNotSwappd,
     ReplyNotSwappd,
     ReplyNotSwappd,                             /* 95 */
diff --git a/include/swaprep.h b/include/swaprep.h
index e31c1e0ce..222881a18 100644
--- a/include/swaprep.h
+++ b/include/swaprep.h
@@ -68,10 +68,6 @@ extern void SGetFontPathReply(ClientPtr /* pClient */ ,
                               int /* size */ ,
                               xGetFontPathReply * /* pRep */ );
 
-extern void SLookupColorReply(ClientPtr /* pClient */ ,
-                              int /* size */ ,
-                              xLookupColorReply * /* pRep */ );
-
 extern void SQueryBestSizeReply(ClientPtr /* pClient */ ,
                                 int /* size */ ,
                                 xQueryBestSizeReply * /* pRep */ );