diff -r f48d95330c7a -r 996b20e55386 src/python/m5/simulate.py
--- a/src/python/m5/simulate.py	Mon Jun 08 12:22:57 2015 +0100
+++ b/src/python/m5/simulate.py	Mon Jun 08 12:23:44 2015 +0100
@@ -224,7 +224,6 @@
         raise TypeError, "Parameter of type '%s'.  Must be type %s or %s." % \
               (type(system), objects.Root, objects.System)
     if system.getMemoryMode() != mode:
-        drain(system)
         system.setMemoryMode(mode)
     else:
         print "System already in target mode. Memory mode unchanged."