diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index d884e790f..9b2d171be 100644
--- a/hw/xwin/win.h
+++ b/hw/xwin/win.h
@@ -500,7 +500,6 @@ typedef struct _winPrivScreenRec {
     winCreateScreenResourcesProc pwinCreateScreenResources;
 
     /* Window Procedures for Rootless mode */
-    ChangeWindowAttributesProcPtr ChangeWindowAttributes;
     RealizeWindowProcPtr RealizeWindow;
     UnrealizeWindowProcPtr UnrealizeWindow;
     ValidateTreeProcPtr ValidateTree;
diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c
index 80dbaea03..f0cbacf59 100644
--- a/hw/xwin/winmultiwindowwindow.c
+++ b/hw/xwin/winmultiwindowwindow.c
@@ -287,9 +287,7 @@ winChangeWindowAttributesMultiWindow(WindowPtr pWin, unsigned long mask)
     ErrorF("winChangeWindowAttributesMultiWindow - pWin: %p\n", pWin);
 #endif
 
-    WIN_UNWRAP(ChangeWindowAttributes);
-    fResult = (*pScreen->ChangeWindowAttributes) (pWin, mask);
-    WIN_WRAP(ChangeWindowAttributes, winChangeWindowAttributesMultiWindow);
+    fbChangeWindowAttributes(pWin, mask);
 
     /*
      * NOTE: We do not currently need to do anything here.
diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c
index a4e62a6f4..f0af427e8 100644
--- a/hw/xwin/winscrinit.c
+++ b/hw/xwin/winscrinit.c
@@ -379,7 +379,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
         /* Save a pointer to each lower-level window procedure */
         WRAP(RealizeWindow);
         WRAP(UnrealizeWindow);
-        WRAP(ChangeWindowAttributes);
         WRAP(SetShape);
 
         /* Assign rootless window procedures to be top level procedures */
@@ -409,7 +408,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
         /* Save a pointer to each lower-level window procedure */
         WRAP(RealizeWindow);
         WRAP(UnrealizeWindow);
-        WRAP(ChangeWindowAttributes);
         WRAP(ReparentWindow);
         WRAP(RestackWindow);
         WRAP(ResizeWindow);
diff --git a/hw/xwin/winwindow.c b/hw/xwin/winwindow.c
index 72e6080cc..a9669f6c0 100644
--- a/hw/xwin/winwindow.c
+++ b/hw/xwin/winwindow.c
@@ -140,9 +140,7 @@ winChangeWindowAttributesRootless(WindowPtr pWin, unsigned long mask)
     winTrace("winChangeWindowAttributesRootless (%p)\n", pWin);
 #endif
 
-    WIN_UNWRAP(ChangeWindowAttributes);
-    fResult = (*pScreen->ChangeWindowAttributes) (pWin, mask);
-    WIN_WRAP(ChangeWindowAttributes, winChangeWindowAttributesRootless);
+    fbChangeWindowAttributes(pWin, mask);
 
     winUpdateRgnRootless(pWin);