diff --git a/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl b/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
index 99cc2f851..83959101e 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
@@ -151,7 +151,7 @@ void main()
 //	spec *= shadow;
 //	color.rgb += spec * specular;
 	
-	color.rgb = atmosTransport(color.rgb);
+//	color.rgb = atmosTransport(color.rgb);
 //	color.rgb = scaleSoftClip(color.rgb);
 //	color.a = spec * sunAngle2;
 
diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp
index 89c5bb88b..4b9f55946 100644
--- a/indra/newview/lldrawpoolwater.cpp
+++ b/indra/newview/lldrawpoolwater.cpp
@@ -404,11 +404,11 @@ void LLDrawPoolWater::shade()
 
 	F32 eyedepth = LLViewerCamera::getInstance()->getOrigin().mV[2] - gAgent.getRegion()->getWaterHeight();
 	
-	if (eyedepth > 0.f && deferred_render)
+	if (deferred_render)
 	{
 		shader = &gDeferredWaterProgram;
 	}
-	else if (eyedepth < 0.f /*&& LLPipeline::sWaterReflections*/)
+	else if (eyedepth < 0.f && LLPipeline::sWaterReflections)
 	{
 		shader = &gUnderWaterProgram;
 	}