Avoided mucking with sys.modules