--- xorg-server-1.18.4/hw/xfree86/common/xf86Init.c~
+++ xorg-server-1.18.4/hw/xfree86/common/xf86Init.c
@@ -488,11 +488,6 @@ InitOutput(ScreenInfo * pScreenInfo, int
 	    if (exit_status == 0)
 		xf86Msg(X_INFO, "Executed %s/%s\n", DRV_SWITCH_PATH, configured_device->driver);
 	}
-	if (exit_status != 0) {
-	    exit_status = xdrvswitch("x11");
-	if (exit_status == 0)
-	    xf86Msg(X_INFO, "Executed %s/%s\n", DRV_SWITCH_PATH, "x11");
-	}
 #endif
 
         /* Load all modules specified explicitly in the config file */