diff -r 1767723f71cf -r 3c8811efdddc mercurial/manifest.py
--- a/mercurial/manifest.py	Tue Oct 18 17:32:51 2016 -0700
+++ b/mercurial/manifest.py	Tue Oct 18 17:33:39 2016 -0700
@@ -1254,13 +1254,12 @@
             usetreemanifest = opts.get('treemanifest', usetreemanifest)
         self._treeinmem = usetreemanifest
 
+        self._oldmanifest = repo._constructmanifest()
+        self._revlog = self._oldmanifest
+
         # We'll separate this into it's own cache once oldmanifest is no longer
         # used
-        self._mancache = repo.manifest._mancache
-
-    @property
-    def _revlog(self):
-        return self._repo.manifest
+        self._mancache = self._oldmanifest._mancache
 
     def __getitem__(self, node):
         """Retrieves the manifest instance for the given node. Throws a KeyError