diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp
index 1cfad1a83..df067bd30 100644
--- a/indra/llrender/llvertexbuffer.cpp
+++ b/indra/llrender/llvertexbuffer.cpp
@@ -767,19 +767,10 @@ void LLVertexBuffer::resizeBuffer(S32 newnverts, S32 newnindices)
 
 BOOL LLVertexBuffer::useVBOs() const
 {
-	//it's generally ineffective to use VBO for things that are streaming on apple
-		
-#if LL_DARWIN
-	if (!mUsage || mUsage == GL_STREAM_DRAW_ARB)
-	{
-		return FALSE;
-	}
-#else
 	if (!mUsage)
 	{
 		return FALSE;
 	}
-#endif
 	return TRUE;
 }
 
diff --git a/indra/newview/llfloaterhardwaresettings.cpp b/indra/newview/llfloaterhardwaresettings.cpp
index 46e1a5806..e10acfe0e 100644
--- a/indra/newview/llfloaterhardwaresettings.cpp
+++ b/indra/newview/llfloaterhardwaresettings.cpp
@@ -103,12 +103,9 @@ void LLFloaterHardwareSettings::refreshEnabledState()
 		childSetEnabled("vbo_stream", FALSE);
 	}
 	else
-#if LL_DARWIN
-		childSetEnabled("vbo_stream", FALSE); //Hardcoded disable on mac
-		childSetValue("vbo_stream", (LLSD::Boolean) FALSE); //Hardcoded disable on mac
-#else
+	{
 		childSetEnabled("vbo_stream", LLVertexBuffer::sEnableVBOs);
-#endif
+	}
 		
 
 	// if no windlight shaders, turn off nighttime brightness, gamma, and fog distance
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 2e65e72af..261ade81f 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -102,10 +102,6 @@
 #include "llspatialpartition.h"
 #include "llmutelist.h"
 
-#if !LL_DARWIN
-#include "llfloaterhardwaresettings.h"
-#endif
-
 // [RLVa:KB]
 #include "rlvhandler.h"
 // [/RLVa:KB]
@@ -4963,10 +4959,6 @@ void LLPipeline::setUseVBO(BOOL use_vbo)
 		
 		resetVertexBuffers();
 		LLVertexBuffer::initClass(use_vbo);
-#if !LL_DARWIN
-		if(LLFloaterHardwareSettings::isOpen())
-			LLFloaterHardwareSettings::instance()->refreshEnabledState();
-#endif
 	}
 }