diff --git a/configs/common/Simulation.py b/configs/common/Simulation.py
index 8e62bcbb69..967f39b75b 100644
--- a/configs/common/Simulation.py
+++ b/configs/common/Simulation.py
@@ -453,6 +453,7 @@ 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)
@@ -469,7 +470,7 @@ def run(options, root, testsys, cpu_class):
             print "Switching CPUS @ tick %s" % (m5.curTick())
             print "Simulation ends instruction count:%d" % \
                     (testsys.switch_cpus_1[0].max_insts_any_thread)
-            m5.drain(testsys)
+            m5.doDrain(testsys)
             m5.switchCpus(switch_cpu_list1)
             m5.resume(testsys)
 
diff --git a/src/python/m5/simulate.py b/src/python/m5/simulate.py
index 9cb647a6b0..0f2a546c14 100644
--- a/src/python/m5/simulate.py
+++ b/src/python/m5/simulate.py
@@ -203,7 +203,6 @@ def changeToTiming(system):
               (type(system), objects.Root, objects.System)
 
     if system.getMemoryMode() != objects.params.timing:
-        doDrain(system)
         print "Changing memory mode to timing"
         for obj in system.descendants():
             obj.changeTiming(objects.params.timing)