diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c
index e2eb847d7..72e6a39f9 100644
--- a/hw/kdrive/src/kdrive.c
+++ b/hw/kdrive/src/kdrive.c
@@ -559,18 +559,13 @@ KdCloseScreen(ScreenPtr pScreen)
     KdScreenPriv(pScreen);
     KdScreenInfo *screen = pScreenPriv->screen;
     KdCardInfo *card = pScreenPriv->card;
-    Bool ret;
 
     if (card->cfuncs->closeScreen)
         (*card->cfuncs->closeScreen)(pScreen);
 
     pScreenPriv->closed = TRUE;
-    pScreen->CloseScreen = pScreenPriv->CloseScreen;
 
-    if (pScreen->CloseScreen)
-        ret = (*pScreen->CloseScreen) (pScreen);
-    else
-        ret = TRUE;
+    Bool ret = fbCloseScreen(pScreen);
 
     if (screen->mynum == card->selected)
         KdDisableScreen(pScreen);
@@ -789,12 +784,6 @@ KdScreenInit(ScreenPtr pScreen, int argc, char **argv)
         if (!(*card->cfuncs->finishInitScreen) (pScreen))
             return FALSE;
 
-    /*
-     * Wrap CloseScreen, the order now is:
-     *  KdCloseScreen
-     *  fbCloseScreen
-     */
-    pScreenPriv->CloseScreen = pScreen->CloseScreen;
     pScreen->CloseScreen = KdCloseScreen;
 
     pScreenPriv->CreateScreenResources = pScreen->CreateScreenResources;
diff --git a/hw/kdrive/src/kdrive.h b/hw/kdrive/src/kdrive.h
index 432f89140..ad341c5eb 100644
--- a/hw/kdrive/src/kdrive.h
+++ b/hw/kdrive/src/kdrive.h
@@ -143,7 +143,6 @@ typedef struct {
     xColorItem systemPalette[KD_MAX_PSEUDO_SIZE];       /* saved windows colors */
 
     CreateScreenResourcesProcPtr CreateScreenResources;
-    CloseScreenProcPtr CloseScreen;
 } KdPrivScreenRec, *KdPrivScreenPtr;
 
 typedef enum _kdPointerState {