diff --git a/src/r600_exa.c b/src/r600_exa.c
index 2dc33a8..2dd5f31 100644
--- a/src/r600_exa.c
+++ b/src/r600_exa.c
@@ -118,7 +118,7 @@ R600PrepareSolid(PixmapPtr pPix, int alu, Pixel pm, Pixel fg)
     CLEAR (vs_conf);
     CLEAR (ps_conf);
 
-    /* return FALSE; */
+    return FALSE;
 
 #ifdef SHOW_VERTEXES
     ErrorF("%dx%d @ %dbpp, 0x%08x\n", pPix->drawable.width, pPix->drawable.height,
@@ -662,7 +662,7 @@ R600PrepareCopy(PixmapPtr pSrc,   PixmapPtr pDst,
     if (pDst->drawable.bitsPerPixel == 24)
 	return FALSE;
 
-    /* return FALSE; */
+    return FALSE;
 
 #ifdef SHOW_VERTEXES
     ErrorF("src: %dx%d @ %dbpp, 0x%08x\n", pSrc->drawable.width, pSrc->drawable.height,
@@ -1382,7 +1382,7 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
     cb_config_t cb_conf;
     shader_config_t vs_conf, ps_conf;
 
-    /* return FALSE; */
+    return FALSE;
 
     if (pMask) {
 	accel_state->has_mask = TRUE;
@@ -2044,7 +2044,7 @@ R600DrawInit(ScreenPtr pScreen)
     info->accel_state->exa->FinishAccess = R600FinishAccess;
 
     /* AGP seems to have problems with gart transfers */
-    if (info->accelDFS) {
+    if (0) {
 	info->accel_state->exa->UploadToScreen = R600UploadToScreen;
 	info->accel_state->exa->DownloadFromScreen = R600DownloadFromScreen;
     }