diff --git a/wxPython/BUILD.win32.txt b/wxPython/BUILD.win32.txt
index 45d09596be..2fe8abf75a 100644
--- a/wxPython/BUILD.win32.txt
+++ b/wxPython/BUILD.win32.txt
@@ -242,6 +242,11 @@ C. To build and install wxPython you simply need to execute the
 
          HYBRID:    python setup.py HYBRID=1 install
 
+   NOTE:  If you get an internal compiler error from MSVC then you
+   need to edit setup.py and add in the /GX- flag that is normally
+   commented out.  Just search for "GX-" and uncomment it so it is put
+   into the cflags list.
+
 
 D. At this point you should be able to change into the wxPython\demo
    directory and run the demo:
diff --git a/wxPython/setup.py b/wxPython/setup.py
index 854c34a81f..28ed092872 100755
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -218,7 +218,9 @@ if os.name == 'nt':
             'advapi32', 'wsock32']
 
 
-    cflags = [] #['/GX-']  # workaround for internal compiler error in MSVC on some machines
+    cflags = [
+             # '/GX-'  # workaround for internal compiler error in MSVC on some machines
+             ]
     lflags = None