diff --git a/direct/src/ffi/FFIConstants.py b/direct/src/ffi/FFIConstants.py
index 786198d122..7b7abbf7a8 100644
--- a/direct/src/ffi/FFIConstants.py
+++ b/direct/src/ffi/FFIConstants.py
@@ -4,7 +4,7 @@ from  DirectNotifyGlobal import *
 notify = directNotify.newCategory("FFI")
 
 # This is the name of the file that the importing code will be stored
-importModuleName = 'PandaModules'
+importModuleName = 'PandaModulesUnsqueezed'
 
 # A header for all the generated files
 generatedHeader = '# This file is automatically generated. It would be unwise to edit.\n\n'
diff --git a/direct/src/ffi/FFIInterrogateDatabase.py b/direct/src/ffi/FFIInterrogateDatabase.py
index a7fbb69986..a035f56bea 100644
--- a/direct/src/ffi/FFIInterrogateDatabase.py
+++ b/direct/src/ffi/FFIInterrogateDatabase.py
@@ -704,8 +704,9 @@ class FFIInterrogateDatabase:
             file.write('from ' + CModuleName + 'Modules import *\n')
         file.close()
 
-        FFIConstants.notify.info( 'Compiling code...')
-        compileall.compile_dir(codeDir)
+        # Commented out based upon assumption that squeeze will do the compile
+        #FFIConstants.notify.info( 'Compiling code...')
+        #compileall.compile_dir(codeDir)
 
     def generateCodeLib(self, codeDir, extensionsDir, CModuleName):
         # Reset the environment so we are clean from any old modules
diff --git a/direct/src/ffi/genPyCode b/direct/src/ffi/genPyCode
index 8ce3d1a55e..bcab477c35 100755
--- a/direct/src/ffi/genPyCode
+++ b/direct/src/ffi/genPyCode
@@ -8,6 +8,8 @@
 firstarg="$1"
 extra_genPyCode_libs=""
 fSqueeze=""
+optimizeFlag=""
+ppythonOptimizeFlag=""
 
 if [ "$firstarg" = "-t" ]; then
 extra_genPyCode_libs="$extra_genPyCode_libs libtoontown"
@@ -61,6 +63,8 @@ if [ "$firstarg" = "win-publish" ]; then
     # no assertions, no comments, no docstrings
     cd $DIRECT/bin
     ppython -OO generatePythonCode -O -v -d `cygpath -w $DIRECT/lib/py` -e `cygpath -w $DIRECT/src/extensions` -i libdtoolconfig libpandaexpress libpanda libpandaphysics libdirect $extra_genPyCode_libs || exit
+    optimizeFlag="-O"
+    ppythonOptimizeFlag="-OO"
 fi
 
 if [ "$firstarg" = "install" ]; then
@@ -74,9 +78,11 @@ if [ "$firstarg" = "release" ]; then
 fi
 
 if [ "$fSqueeze" = "squeezeMe" ]; then
-    echo SQUEEZING ShowBaseGlobals
-    cd $DIRECT/src/showbase
-    ppython pandaSqueezer.py || exit
+    echo SQUEEZING PandaModules
+    cd $DIRECT/lib/py
+    rm -f PandaModules.py*
+    pSqueezer=`cygpath -w $DIRECT/src/showbase/pandaSqueezer.py`
+    ppython $ppythonOptimizeFlag $pSqueezer $optimizeFlag || exit
 fi
 
 echo DONE