diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp
index 2c928e1..104433f 100644
--- a/src/glsl/link_uniforms.cpp
+++ b/src/glsl/link_uniforms.cpp
@@ -942,11 +942,12 @@ link_assign_uniform_locations(struct gl_shader_program *prog,
 
 	 /* FINISHME: Update code to process built-in uniforms!
 	  */
-	 if (is_gl_identifier(var->name)) {
+	 /*if (is_gl_identifier(var->name) && is_gl_identifier(var->type->name)) {
 	    uniform_size.num_shader_uniform_components +=
 	       var->type->component_slots();
+
 	    continue;
-	 }
+	 }*/
 
 	 uniform_size.process(var);
       }
@@ -994,8 +995,8 @@ link_assign_uniform_locations(struct gl_shader_program *prog,
 
 	 /* FINISHME: Update code to process built-in uniforms!
 	  */
-	 if (is_gl_identifier(var->name))
-	    continue;
+	 /*if (is_gl_identifier(var->name) && is_gl_identifier(var->type->name))
+	    continue;*/
 
 	 parcel.set_and_process(prog, var);
       }