diff --git a/Core/Dialog/PSPOskDialog.cpp b/Core/Dialog/PSPOskDialog.cpp
index 06a57d6e32..a5562976a4 100755
--- a/Core/Dialog/PSPOskDialog.cpp
+++ b/Core/Dialog/PSPOskDialog.cpp
@@ -116,7 +116,9 @@ static const wchar_t oskKeys[OSK_KEYBOARD_COUNT][5][14] =
 
 
 PSPOskDialog::PSPOskDialog() : PSPDialog() {
-	setlocale(LC_ALL, "");
+	// This can break all kinds of stuff, changing the decimal point in sprintf for example.
+	// Not sure what the intended effect is so commented out for now.
+	// setlocale(LC_ALL, "");
 }
 
 PSPOskDialog::~PSPOskDialog() {
diff --git a/GPU/GLES/VertexShaderGenerator.cpp b/GPU/GLES/VertexShaderGenerator.cpp
index 507cdb1bef..6712c62a91 100644
--- a/GPU/GLES/VertexShaderGenerator.cpp
+++ b/GPU/GLES/VertexShaderGenerator.cpp
@@ -134,10 +134,6 @@ enum DoLightComputation {
 };
 
 void GenerateVertexShader(int prim, char *buffer) {
-	// Apparently, sprintf can output "," unless we do this, which is a disaster for this line later on:
-	// WRITE(p, "  worldpos = (u_world * vec4(worldpos * %f, 1.0)).xyz;\n", factor);
-	setlocale( LC_ALL, "C" );
-
 	char *p = buffer;
 #if defined(USING_GLES2)
 	WRITE(p, "precision highp float;\n");
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index 6eaf1b7532..5dda8ee4a9 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -27,7 +27,7 @@
 // Background worker threads should be spawned in NativeInit and joined
 // in NativeShutdown.
 
-
+#include <locale.h>
 
 #include "base/logging.h"
 #include "base/NativeApp.h"
@@ -194,6 +194,7 @@ void NativeGetAppInfo(std::string *app_dir_name, std::string *app_nice_name, boo
 void NativeInit(int argc, const char *argv[], const char *savegame_directory, const char *external_directory, const char *installID)
 {
 	EnableFZ();
+	setlocale( LC_ALL, "C" );
 	std::string user_data_path = savegame_directory;
 	isMessagePending = false;
 	// We want this to be FIRST.