diff --git a/indra/newview/llappcorehttp.cpp b/indra/newview/llappcorehttp.cpp
index a5a8891aad..bb21cb7026 100644
--- a/indra/newview/llappcorehttp.cpp
+++ b/indra/newview/llappcorehttp.cpp
@@ -388,20 +388,6 @@ void LLAppCoreHttp::refreshSettings(bool initial)
 	// Global pipelining setting
 	bool pipeline_changed(false);
 	static const std::string http_pipelining("HttpPipelining");
-// <FS:Ansariel> FIRE-17287: Force HttpPipelining off on OpenSim
-#ifdef OPENSIM
-	if (LLGridManager::instance().isInOpenSim())
-	{
-		if (mPipelined)
-		{
-			mPipelined = false;
-			pipeline_changed = true;
-		}
-		LL_INFOS() << "HTTP Pipelining is not supported on OpenSim - setting to disabled." << LL_ENDL;
-	}
-	else
-#endif
-// </FS:Ansariel>
 	if (gSavedSettings.controlExists(http_pipelining))
 	{
 		// Default to true (in ctor) if absent.
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 25d2bd78b8..3749afdcb4 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1641,9 +1641,6 @@ bool idle_startup()
 		progress += 0.02f;
 		display_startup();
 
-		// <FS:Ansariel> FIRE-17287: Force HttpPipelining off on OpenSim
-		LLAppViewer::instance()->getAppCoreHttp().refreshSettings(false);
-
 // <AW: crash report grid correctness>
 		eLastExecEvent last_exec_event = gLastExecEvent;
 		const std::string current_grid = LLGridManager::getInstance()->getGrid();