diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp
index 64b157e9d5..a11378259f 100644
--- a/indra/llcommon/llstring.cpp
+++ b/indra/llcommon/llstring.cpp
@@ -1301,9 +1301,12 @@ void LLStringUtil::formatNumber(std::string& numStr, std::string decimals)
 		if (convertToS32(numStr, intStr))
 		{
 			strStream << intStr;
+			numStr = strStream.str();
 			// <FS:Ansariel> FIRE-6070: Fix random symbols in formatted numbers in some locales
-			//numStr = strStream.str();
-			numStr = ll_convert_string_to_utf8_string(strStream.str());
+#ifdef LL_WINDOWS
+			numStr = ll_convert_string_to_utf8_string(numStr);
+#endif
+			// </FS:Ansariel>
 		}
 	}
 	else
@@ -1313,9 +1316,12 @@ void LLStringUtil::formatNumber(std::string& numStr, std::string decimals)
 		if (convertToF32(numStr, floatStr))
 		{
 			strStream << std::fixed << std::showpoint << std::setprecision(intDecimals) << floatStr;
+			numStr = strStream.str();
 			// <FS:Ansariel> FIRE-6070: Fix random symbols in formatted numbers in some locales
-			//numStr = strStream.str();
-			numStr = ll_convert_string_to_utf8_string(strStream.str());
+#ifdef LL_WINDOWS
+			numStr = ll_convert_string_to_utf8_string(numStr);
+#endif
+			// </FS:Ansariel>
 		}
 	}
 }