From a6ff5e6bfc117f9151c6506a5f6f4bba51a1676c Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Wed, 7 Nov 2018 21:32:51 +0100
Subject: [PATCH] Cleanup/follow-up to #4319

---
 src/_pytest/main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/_pytest/main.py b/src/_pytest/main.py
index 910812419..9f4340b5a 100644
--- a/src/_pytest/main.py
+++ b/src/_pytest/main.py
@@ -386,6 +386,7 @@ class Session(nodes.FSCollector):
         self._initialpaths = frozenset()
         # Keep track of any collected nodes in here, so we don't duplicate fixtures
         self._node_cache = {}
+        # Dirnames of pkgs with dunder-init files.
         self._pkg_roots = {}
 
         self.config.pluginmanager.register(self, name="session")
@@ -535,8 +536,7 @@ class Session(nodes.FSCollector):
                     seen_dirs.add(dirpath)
                     pkginit = dirpath.join("__init__.py")
                     if pkginit.exists():
-                        collect_root = self._pkg_roots.get(dirpath, self)
-                        for x in collect_root._collectfile(pkginit):
+                        for x in self._collectfile(pkginit):
                             yield x
                             if isinstance(x, Package):
                                 self._pkg_roots[dirpath] = x