diff --git a/Common/MathUtil.h b/Common/MathUtil.h
index 090f02d628..d56d5c19e5 100644
--- a/Common/MathUtil.h
+++ b/Common/MathUtil.h
@@ -1,6 +1,5 @@
-
 // Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Licensed under GPLv2+
 // Refer to the license.txt file included.
 
 #pragma once
diff --git a/Core/System.cpp b/Core/System.cpp
index 49f6d5b486..e085f33126 100644
--- a/Core/System.cpp
+++ b/Core/System.cpp
@@ -268,7 +268,6 @@ void UpdateLoadedFile(FileLoader *fileLoader) {
 
 void CPU_RunLoop() {
 	setCurrentThreadName("CPU");
-	FPU_SetFastMode();
 
 	if (CPU_NextState(CPU_THREAD_PENDING, CPU_THREAD_STARTING)) {
 		CPU_Init();
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index ef9408cb32..4a7584e679 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -276,13 +276,6 @@ void NativeInit(int argc, const char *argv[],
 	InitFastMath(cpu_info.bNEON);
 	SetupAudioFormats();
 
-	// Sets both FZ and DefaultNaN on ARM, flipping some ARM implementations into "RunFast" mode for VFP.
-	// http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ddi0274h/Babffifj.html
-	// Do we need to do this on all threads?
-	// Also, the FZ thing may actually be a little bit dangerous, I'm not sure how compliant the MIPS
-	// CPU is with denormal handling. Needs testing. Default-NAN should be reasonably safe though.
-	FPU_SetFastMode();
-
 	bool skipLogo = false;
 	setlocale( LC_ALL, "C" );
 	std::string user_data_path = savegame_directory;
@@ -488,8 +481,6 @@ void NativeInit(int argc, const char *argv[],
 }
 
 void NativeInitGraphics() {
-	FPU_SetFastMode();
-
 #ifndef _WIN32
 	// Force backend to GL
 	g_Config.iGPUBackend = GPU_BACKEND_OPENGL;