diff --git a/src/i830_batchbuffer.c b/src/i830_batchbuffer.c
index b8995e27..bf0b55b9 100644
--- a/src/i830_batchbuffer.c
+++ b/src/i830_batchbuffer.c
@@ -59,11 +59,10 @@ static void intel_next_batch(ScrnInfoPtr scrn)
 	intel->batch_used = 0;
 	intel->batch_ptr = intel->batch_bo->virtual;
 
-	/* If we are using DRI2, we don't know when another client has executed,
-	 * so we have to reinitialize our 3D state per batch.
+	/* We don't know when another client has executed, so we have
+	 * to reinitialize our 3D state per batch.
 	 */
-	if (intel->directRenderingType == DRI_DRI2)
-		intel->last_3d = LAST_3D_OTHER;
+	intel->last_3d = LAST_3D_OTHER;
 }
 
 void intel_batch_init(ScrnInfoPtr scrn)
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 33138d73..86ef0fad 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -1401,9 +1401,6 @@ static Bool I830EnterVT(int scrnIndex, int flags)
 	if (!xf86SetDesiredModes(scrn))
 		return FALSE;
 
-	/* Mark all state as being clobbered. */
-	intel->last_3d = LAST_3D_OTHER;
-
 	return TRUE;
 }