removed ugly sys.modules hack