diff --git a/src/atidri.c b/src/atidri.c
index 33f5389..93de504 100644
--- a/src/atidri.c
+++ b/src/atidri.c
@@ -414,7 +414,6 @@ static void ATIDRITransitionTo2d_EXA(Scr
 {
    ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum];
    ATIPtr pATI = ATIPTR(pScreenInfo);
-#if 0
    ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo;
 
    exaEnableDisableFBAccess(pScreen->myNum, FALSE);
@@ -422,7 +421,6 @@ #if 0
    pATI->pExa->offScreenBase = pATIDRIServer->backOffset;
 
    exaEnableDisableFBAccess(pScreen->myNum, TRUE);
-#endif
 
    pATI->have3DWindows = FALSE;
 
@@ -434,7 +432,6 @@ static void ATIDRITransitionTo3d_EXA(Scr
 {
    ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum];
    ATIPtr pATI = ATIPTR(pScreenInfo);
-#if 0
    ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo;
 
    exaEnableDisableFBAccess(pScreen->myNum, FALSE);
@@ -443,7 +440,6 @@ #if 0
 			       pATIDRIServer->textureSize;
 
    exaEnableDisableFBAccess(pScreen->myNum, TRUE);
-#endif
 
    pATI->have3DWindows = TRUE;
 
diff --git a/src/atimach64exa.c b/src/atimach64exa.c
index e2b2540..380228c 100644
--- a/src/atimach64exa.c
+++ b/src/atimach64exa.c
@@ -570,8 +570,7 @@ #ifdef XF86DRI_DEVEL
 	pATIDRIServer->textureSize = textureSize;
 	next += textureSize;
 
-	if (pATI->directRenderingEnabled)
-	    pExa->offScreenBase = next;
+	/* pExa->offScreenBase is moved to "next" when DRI gets activated */
     }
 #endif /* XF86DRI_DEVEL */