diff --git a/src/i830_hwmc.c b/src/i830_hwmc.c
index 3471524..080bb5a 100644
--- a/src/i830_hwmc.c
+++ b/src/i830_hwmc.c
@@ -61,7 +61,9 @@ Bool intel_xvmc_probe(ScrnInfoPtr scrn)
 
 	if (IS_I9XX(intel)) {
 		if (IS_I915(intel))
-			ret = intel_xvmc_set_driver(&i915_xvmc_driver);
+			/* xvmc on i915 class is severely broken */
+			return FALSE;
+			/*ret = intel_xvmc_set_driver(&i915_xvmc_driver);*/
 		else if (IS_G4X(intel) || IS_IGDNG(intel))
 			ret = intel_xvmc_set_driver(&vld_xvmc_driver);
 		else