diff --git a/indra/llmessage/aihttptimeoutpolicy.cpp b/indra/llmessage/aihttptimeoutpolicy.cpp
index e1a1846af..a37a9f916 100644
--- a/indra/llmessage/aihttptimeoutpolicy.cpp
+++ b/indra/llmessage/aihttptimeoutpolicy.cpp
@@ -905,7 +905,7 @@ AIHTTPTimeoutPolicy const* AIHTTPTimeoutPolicy::getTimeoutPolicyByName(std::stri
 #define P2(n, b)	AIHTTPTimeoutPolicy n##_timeout(#n, b)
 
 // Policy name									Policy
-P(accountingCostResponder);
+//P(accountingCostResponder);
 P(agentStateResponder);
 P(appearanceChangeMetricsResponder);
 P(assetUploadResponder);
@@ -993,4 +993,4 @@ P(webProfileResponders);
 P(wholeModelFeeResponder);
 P(wholeModelUploadResponder);
 P2(XMLRPCResponder,								connect_40s);
-P2(crashLoggerResponder,						transfer_300s);
\ No newline at end of file
+P2(crashLoggerResponder,						transfer_300s);
diff --git a/indra/llmessage/aihttptimeoutpolicy.h b/indra/llmessage/aihttptimeoutpolicy.h
index 6c8fa0683..ba5347482 100644
--- a/indra/llmessage/aihttptimeoutpolicy.h
+++ b/indra/llmessage/aihttptimeoutpolicy.h
@@ -95,7 +95,7 @@ class AIHTTPTimeoutPolicy {
 	void sanity_checks(void) const;
 
 	// Accessors.
-	char const* name(void) const { return mName; }
+	char const* name(void) const { return mName ? mName : "AIHTTPTimeoutPolicyBase"; }
 	U16 getConnectTimeout(std::string const& hostname) const;
 	U16 getDNSLookup(void) const { return mDNSLookupGrace; }
 	U16 getConnect(void) const { return mMaximumConnectTime; }
diff --git a/indra/llmessage/llhttpclient.h b/indra/llmessage/llhttpclient.h
index 6e0d6adb6..b0fdd53f3 100644
--- a/indra/llmessage/llhttpclient.h
+++ b/indra/llmessage/llhttpclient.h
@@ -288,7 +288,7 @@ public:
 		virtual AICapabilityType capability_type(void) const { return cap_other; }
 
 		// Timeout policy to use.
-		virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const = 0;
+		virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const;
 
 		// The name of the derived responder object. For debugging purposes.
 		virtual char const* getName(void) const = 0;
diff --git a/indra/newview/llaccountingcostmanager.cpp b/indra/newview/llaccountingcostmanager.cpp
index c8cd09dd6..815054c33 100644
--- a/indra/newview/llaccountingcostmanager.cpp
+++ b/indra/newview/llaccountingcostmanager.cpp
@@ -30,9 +30,6 @@
 #include "llcurl.h"
 #include "llhttpclient.h"
 
-class AIHTTPTimeoutPolicy;
-extern AIHTTPTimeoutPolicy accountingCostResponder_timeout;
-
 //===============================================================================
 LLAccountingCostManager::LLAccountingCostManager()
 {	
@@ -101,7 +98,6 @@ public:
 		clearPendingRequests();
 	}
 	
-	/*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return accountingCostResponder_timeout; }
 	/*virtual*/ char const* getName(void) const { return "LLAccountingCostResponder"; }
 
 private: