diff -r a317086a3e19 -r 5222bd5462f2 src/python/m5/__init__.py
--- a/src/python/m5/__init__.py	Thu Sep 05 13:53:54 2013 -0400
+++ b/src/python/m5/__init__.py	Wed Sep 11 16:19:57 2013 +0100
@@ -32,7 +32,7 @@
 
 try:
     # Try to import something that's generated by swig
-    import internal
+    import internal.core
 
     # Try to grab something from it in case demandimport is being used
     internal.core.curTick
diff -r a317086a3e19 -r 5222bd5462f2 src/python/m5/internal/__init__.py
--- a/src/python/m5/internal/__init__.py	Thu Sep 05 13:53:54 2013 -0400
+++ b/src/python/m5/internal/__init__.py	Wed Sep 11 16:19:57 2013 +0100
@@ -25,10 +25,3 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 # Authors: Nathan Binkert
-
-import core
-import debug
-import event
-import stats
-import trace
-from drain import DrainManager, Drainable