diff --git a/Quake/gl_rmain.c b/Quake/gl_rmain.c
index 9a498095..faf4a15e 100644
--- a/Quake/gl_rmain.c
+++ b/Quake/gl_rmain.c
@@ -366,7 +366,8 @@ void R_Clear (void)
 	unsigned int clearbits;
 
 	clearbits = GL_DEPTH_BUFFER_BIT;
-	if (gl_clear.value || isIntelVideo) clearbits |= GL_COLOR_BUFFER_BIT; //intel video workarounds from Baker
+	if (gl_clear.value)
+		clearbits |= GL_COLOR_BUFFER_BIT;
 	glClear (clearbits);
 }
 
diff --git a/Quake/gl_rmisc.c b/Quake/gl_rmisc.c
index 84e8f491..5e46db3a 100644
--- a/Quake/gl_rmisc.c
+++ b/Quake/gl_rmisc.c
@@ -176,6 +176,9 @@ void R_Init (void)
 
 	Sky_Init (); //johnfitz
 	Fog_Init (); //johnfitz
+
+	if (isIntelVideo) //intel video workarounds from Baker
+		Cvar_SetQuick (&gl_clear, "1");
 }
 
 /*
diff --git a/Quake/gl_screen.c b/Quake/gl_screen.c
index 42b7f6e1..ad6f6820 100644
--- a/Quake/gl_screen.c
+++ b/Quake/gl_screen.c
@@ -950,7 +950,7 @@ SCR_TileClear -- johnfitz -- modified to use glwidth/glheight instead of vid.wid
 */
 void SCR_TileClear (void)
 {
-	if (scr_tileclear_updates >= vid.numpages && !gl_clear.value && !isIntelVideo) //intel video workarounds from Baker
+	if (scr_tileclear_updates >= vid.numpages && !gl_clear.value)
 		return;
 	scr_tileclear_updates++;
 
diff --git a/Quake/sbar.c b/Quake/sbar.c
index 3c6c7fcd..1c284d29 100644
--- a/Quake/sbar.c
+++ b/Quake/sbar.c
@@ -930,7 +930,7 @@ void Sbar_Draw (void)
 	if (cl.intermission)
 		return; //johnfitz -- never draw sbar during intermission
 
-	if (sb_updates >= vid.numpages && !gl_clear.value && scr_sbaralpha.value >= 1 && !isIntelVideo) //johnfitz -- gl_clear, scr_sbaralpha, intel workarounds from baker
+	if (sb_updates >= vid.numpages && !gl_clear.value && scr_sbaralpha.value >= 1) //johnfitz -- gl_clear, scr_sbaralpha
 		return;
 
 	sb_updates++;