diff --git a/stepmania/src/RageException.h b/stepmania/src/RageException.h
index 754917a2fd..1fcb728270 100644
--- a/stepmania/src/RageException.h
+++ b/stepmania/src/RageException.h
@@ -36,10 +36,10 @@ protected:
 //#define RAGE_ASSERT(COND) RAGE_ASSERT_M((COND), "Assertion failure")
 
 /* Make this the default assert handler. */
-//#ifdef ASSERT
-//#undef ASSERT
-//#endif
-//#define ASSERT RAGE_ASSERT
+#ifdef ASSERT
+#undef ASSERT
+#endif
+#define ASSERT(x) ;
 
 
 #endif
diff --git a/stepmania/src/StdString.h b/stepmania/src/StdString.h
index db289ab23b..db99029cdf 100644
--- a/stepmania/src/StdString.h
+++ b/stepmania/src/StdString.h
@@ -369,6 +369,8 @@ inline const Type& SSMAX(const Type& arg1, const Type& arg2)
 	#endif
 
 #endif // #ifndef W32BASE_H
+#undef ASSERT
+#define ASSERT(x) ;
 
 // Standard headers needed