diff --git a/configs/common/Simulation.py b/configs/common/Simulation.py
index 967f39b75..f6273a6f0 100644
--- a/configs/common/Simulation.py
+++ b/configs/common/Simulation.py
@@ -453,7 +453,6 @@ def run(options, root, testsys, cpu_class):
         # manually.  You DON'T need to resume after just switching
         # CPUs if you haven't changed anything on the system level.
 
-        m5.doDrain(testsys)
         m5.changeToTiming(testsys)
         m5.switchCpus(switch_cpu_list)
         m5.resume(testsys)
diff --git a/src/python/m5/simulate.py b/src/python/m5/simulate.py
index 5fc00ad05..89b6b1e9d 100644
--- a/src/python/m5/simulate.py
+++ b/src/python/m5/simulate.py
@@ -207,6 +207,7 @@ def changeToTiming(system):
               (type(system), objects.Root, objects.System)
 
     if system.getMemoryMode() != objects.params.timing:
+        doDrain(system)
         print "Changing memory mode to timing"
         system.setMemoryMode(objects.params.timing)