diff --git a/src/mesa/drivers/dri/i915/intel_context.c b/src/mesa/drivers/dri/i915/intel_context.c
index 577b22694b3..252c0d6f424 100644
--- a/src/mesa/drivers/dri/i915/intel_context.c
+++ b/src/mesa/drivers/dri/i915/intel_context.c
@@ -260,8 +260,7 @@ intelFlush(GLcontext * ctx)
    if (intel->batch->map != intel->batch->ptr)
       intel_batchbuffer_flush(intel->batch);
 
-   /* XXX: Need to do an MI_FLUSH here.  Actually, the bufmgr_fake.c
-    * code will have done one already.
+   /* XXX: Need to do an MI_FLUSH here.
     */
 }
 
diff --git a/src/mesa/drivers/dri/i915/intel_regions.c b/src/mesa/drivers/dri/i915/intel_regions.c
index 9c33152d98e..7176ef137a6 100644
--- a/src/mesa/drivers/dri/i915/intel_regions.c
+++ b/src/mesa/drivers/dri/i915/intel_regions.c
@@ -127,10 +127,9 @@ intel_region_release(intelScreenPrivate *intelScreen,
       assert((*region)->map_refcount == 0);
 
       if ((*region)->pbo)
-         intel_region_release_pbo(intelScreen, *region);
-      
-      driDeleteBuffers(1, &(*region)->buffer);
-
+	 (*region)->pbo->region = NULL;
+      (*region)->pbo = NULL;
+      driBOUnReference((*region)->buffer);
       free(*region);
    }
    *region = NULL;