--- a/make/windows/makefiles/defs.make	Thu May 24 13:37:47 2012 +0200
+++ b/make/windows/makefiles/defs.make	Thu May 24 12:57:01 2012 -0700
@@ -143,14 +143,7 @@
 MAKE_ARGS += ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)
 
 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-  # Disable ZIP_DEBUGINFO_FILES by default because various tests are
-  # failing in nightly when the debug info files are ZIP'ed.
-  #ZIP_DEBUGINFO_FILES ?= 0
-  # The above conditional setting logic is unreliable on Windows for
-  # unknown reasons. We force ZIP_DEBUGINFO_FILES to be disabled on
-  # Windows until we figure out why the various tests are failing
-  # AND why the conditional setting logic is unreliable.
-  ZIP_DEBUGINFO_FILES=0
+  ZIP_DEBUGINFO_FILES ?= 1
 else
   ZIP_DEBUGINFO_FILES=0
 endif