diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index d8b158e..e06a2fc 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -1464,7 +1464,7 @@ Bool drmmode_pre_init(ScrnInfoPtr scrn, int fd, int cpp)
 	if (has_flipping) {
 		xf86DrvMsg(scrn->scrnIndex, X_INFO,
 			   "Kernel page flipping support detected, enabling\n");
-		intel->use_pageflipping = TRUE;
+		intel->use_pageflipping = FALSE;
 		drmmode->flip_count = 0;
 		drmmode->event_context.version = DRM_EVENT_CONTEXT_VERSION;
 		drmmode->event_context.vblank_handler = drmmode_vblank_handler;
diff --git a/src/i830_dri.c b/src/i830_dri.c
index 321faf6..d220e3d 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -1013,7 +1013,7 @@ Bool I830DRI2ScreenInit(ScreenPtr screen)
 
 	info.CopyRegion = I830DRI2CopyRegion;
 #if DRI2INFOREC_VERSION >= 4
-	if (intel->use_pageflipping) {
+	if (intel->use_pageflipping || 1) {
 	    info.version = 4;
 	    info.ScheduleSwap = I830DRI2ScheduleSwap;
 	    info.GetMSC = I830DRI2GetMSC;