diff --git a/config/WIN32 b/config/WIN32
index 3b8e43fa10b..655b17d2a1f 100644
--- a/config/WIN32
+++ b/config/WIN32
@@ -55,7 +55,7 @@ JAVAH_PROG = $(JAVA) netscape.tools.jric.Main
 #
 # compile with debug symbols, but without DEBUG code and ASSERTs
 #
-OPTIMIZER=-Z7 -UDEBUG -DNDEBUG -U_DEBUG
+OPTIMIZER=-Z7 -O1 -UDEBUG -DNDEBUG -U_DEBUG
 OS_LFLAGS=/DEBUG /DEBUGTYPE:CV /PDB:NONE
 
 !else
diff --git a/nsprpub/config/WIN32.mk b/nsprpub/config/WIN32.mk
index 2c1fedf6e98..a7d7e173fba 100644
--- a/nsprpub/config/WIN32.mk
+++ b/nsprpub/config/WIN32.mk
@@ -67,31 +67,20 @@ DLL_SUFFIX = dll
 
 OS_CFLAGS = -W3 -nologo -GF -Gy
 
-ifdef MOZ_PROF
-
-#
-# compile with debug symbols, but without DEBUG code and ASSERTs
-#
-ifdef USE_DEBUG_RTL
-OS_CFLAGS += -MDd
-else
-OS_CFLAGS += -MD
-endif
-OPTIMIZER = -Od -Z7
-#OPTIMIZER = -Zi -Fd$(OBJDIR)/ -Od
-DEFINES = -UDEBUG -U_DEBUG -DNDEBUG
-DLLFLAGS = -DEBUG -DEBUGTYPE:CV -OUT:"$@"
-OBJDIR_TAG = _DBG
-LDFLAGS = -DEBUG -DEBUGTYPE:CV
-
-else
-
 ifdef BUILD_OPT
 OS_CFLAGS += -MD
 OPTIMIZER = -O2
 DEFINES = -UDEBUG -U_DEBUG -DNDEBUG
 DLLFLAGS = -OUT:"$@"
 OBJDIR_TAG = _OPT
+
+# Add symbolic information for use by a profiler
+ifdef MOZ_PROF
+OPTIMIZER += -Z7
+DLLFLAGS += -DEBUG -DEBUGTYPE:CV
+LDFLAGS += -DEBUG -DEBUGTYPE:CV
+endif
+
 else
 #
 # Define USE_DEBUG_RTL if you want to use the debug runtime library
@@ -118,7 +107,6 @@ endif
 OBJDIR_TAG = _DBG
 LDFLAGS = -DEBUG -DEBUGTYPE:CV
 endif
-endif
 
 DEFINES += -DWIN32
 ifeq ($(USE_STATIC_TLS),1)