diff --git a/dtool/Config.pp b/dtool/Config.pp
index 50d88c56e5..1fafdb12b2 100644
--- a/dtool/Config.pp
+++ b/dtool/Config.pp
@@ -367,25 +367,6 @@
 // on DirectX rendering.
 #defer SUPPORT_IMMEDIATE_MODE $[<= $[OPTIMIZE], 3]
 
-// Do you want to compile in support for pipelining?  This enables
-// setting and accessing multiple different copies of frame-specific
-// data stored in nodes, etc.  This is necessary, in conjunction with
-// HAVE_THREADS, to implement threaded multistage rendering in Panda.
-// However, compiling this option in does add some additional runtime
-// overhead even if it is not used.  By default, we enable pipelining
-// whenever threads are enabled, assuming that if you have threads,
-// you also want to use pipelining.  We also enable it at OPTIMIZE
-// level 1, since that enables additional runtime checks.
-//#defer DO_PIPELINING $[or $[<= $[OPTIMIZE], 1],$[HAVE_THREADS]]
-
-// Actually, let's *not* assume that threading implies pipelining, at
-// least not until pipelining is less of a performance hit.
-//#defer DO_PIPELINING $[<= $[OPTIMIZE], 1]
-
-// Pipelining is a little broken right now.  Turn it off altogether
-// for now.
-#defer DO_PIPELINING
-
 // Panda contains some experimental code to compile for IPhone.  This
 // requires the Apple IPhone SDK, which is currently only available
 // for OS X platforms.  Set this to either "iPhoneSimulator" or
@@ -833,7 +814,7 @@
 // This will compile in a homespun cooperative threading
 // implementation that runs strictly on one CPU, adding very little
 // overhead over plain single-threaded code.
-#define SIMPLE_THREADS 1
+#define SIMPLE_THREADS
 
 // If this is defined true, then OS threading constructs will be used
 // (if available) to perform context switches in the SIMPLE_THREADS
@@ -854,6 +835,19 @@
 // run-time overhead for these tests.
 #defer DEBUG_THREADS $[<= $[OPTIMIZE], 2]
 
+// Do you want to compile in support for pipelining?  This adds code
+// to maintain a different copy of the scene graph for each thread in
+// the render pipeline, so that app, cull, and draw may each safely
+// run in a separate thread, allowing maximum parallelization of CPU
+// processing for the frame.  Enabling this option does not *require*
+// you to use separate threads for rendering, but makes it possible.
+// However, compiling this option in does add some additional runtime
+// overhead even if it is not used.  By default, we enable pipelining
+// whenever threads are enabled, assuming that if you have threads,
+// you also want to use pipelining.  We also enable it at OPTIMIZE
+// level 1, since that enables additional runtime checks.
+#defer DO_PIPELINING $[or $[<= $[OPTIMIZE], 1],$[HAVE_THREADS]]
+
 // Define this true to implement mutexes and condition variables via
 // user-space spinlocks, instead of via OS-provided constructs.  This
 // is almost never a good idea, except possibly in very specialized
diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py
index b445e6e11e..0a0bb286c0 100755
--- a/makepanda/makepanda.py
+++ b/makepanda/makepanda.py
@@ -1384,7 +1384,7 @@ DTOOL_CONFIG=[
     ("HAVE_DX9",                       'UNDEF',                  'UNDEF'),
     ("HAVE_CHROMIUM",                  'UNDEF',                  'UNDEF'),
     ("HAVE_THREADS",                   '1',                      '1'),
-    ("SIMPLE_THREADS",                 '1',                      '1'),
+    ("SIMPLE_THREADS",                 'UNDEF',                  'UNDEF'),
     ("OS_SIMPLE_THREADS",              '1',                      '1'),
     ("DEBUG_THREADS",                  'UNDEF',                  'UNDEF'),
     ("HAVE_POSIX_THREADS",             'UNDEF',                  '1'),
@@ -1395,7 +1395,7 @@ DTOOL_CONFIG=[
     ("SUPPORT_IMMEDIATE_MODE",         '1',                      '1'),
     ("TRACK_IN_INTERPRETER",           'UNDEF',                  'UNDEF'),
     ("DO_MEMORY_USAGE",                'UNDEF',                  'UNDEF'),
-    ("DO_PIPELINING",                  'UNDEF',                  'UNDEF'),
+    ("DO_PIPELINING",                  '1',                      '1'),
     ("EXPORT_TEMPLATES",               'yes',                    'yes'),
     ("LINK_IN_GL",                     'UNDEF',                  'UNDEF'),
     ("LINK_IN_PHYSICS",                'UNDEF',                  'UNDEF'),