diff --git a/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl b/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
index 17288873c81c3a7353e0e0b6c2186fd321eb79e4..46d5b9b61236b6d75869367b61e2929e2568f09f 100755
--- a/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
@@ -192,7 +192,7 @@ void main()
 	//wavef = normalize(wavef);
 	vec3 screenspacewavef = (norm_mat*vec4(wavef, 1.0)).xyz;
 	
-	frag_data[0] = vec4(linear_to_srgb(color.rgb), 0.5); // diffuse
+	frag_data[0] = vec4(color.rgb, 0.5); // diffuse
 	frag_data[1] = vec4(0.5,0.5,0.5, 0.95); // speccolor*spec, spec
 	frag_data[2] = vec4(encode_normal(screenspacewavef), 0.0, 0.0); // normalxyz, displace
 }
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index fc79f1c31feee9661482f83f2410008b37c245f9..d88cb30887a35301a68b326a65182ba5d0a4de90 100755
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -122,9 +122,9 @@
 //#define DEBUG_INDICES
 #endif
 
-// Expensive
+// Expensive and currently broken
 //
-#define MATERIALS_IN_REFLECTIONS 1
+#define MATERIALS_IN_REFLECTIONS 0
 
 bool gShiftFrame = false;
 
@@ -1236,7 +1236,11 @@ void LLPipeline::createGLBuffers()
 
 	updateRenderDeferred();
 
-	bool materials_in_water = gSavedSettings.getS32("RenderWaterMaterials");
+	bool materials_in_water = false;
+
+#if MATERIALS_IN_REFLECTIONS
+	materials_in_water = gSavedSettings.getS32("RenderWaterMaterials");
+#endif
 
 	if (LLPipeline::sWaterReflections)
 	{ //water reflection texture
@@ -9685,7 +9689,11 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
 			water_clip = 1;
 		}
 
-		bool materials_in_water = gSavedSettings.getS32("RenderWaterMaterials");
+		bool materials_in_water = false;
+
+#if MATERIALS_IN_REFLECTIONS
+		materials_in_water = gSavedSettings.getS32("RenderWaterMaterials");
+#endif
 
 		if (!LLViewerCamera::getInstance()->cameraUnderWater())
 		{	//generate planar reflection map