diff --git a/bpython/importcompletion.py b/bpython/importcompletion.py
@@ -48,6 +48,9 @@

# The cached list of all known modules
modules = set()
fully_loaded = False


@@ -190,9 +193,12 @@ def find_modules(path):
            continue
        else:
            if is_package:
-                for subname in find_modules(pathname):
-                    if subname != "__init__":
-                        yield "%s.%s" % (name, subname)
            yield name



diff --git a/bpython/test/test_import_not_cyclical.py b/bpython/test/test_import_not_cyclical.py
@@ -0,0 +1,92 @@