--- a/mercurial/manifest.py	Thu May 04 12:48:45 2017 +0200
+++ b/mercurial/manifest.py	Fri May 05 14:10:58 2017 -0700
@@ -1340,12 +1340,7 @@
                    the revlog
         """
         if node in self._dirmancache.get(dir, ()):
-            cachemf = self._dirmancache[dir][node]
-            # The old manifest may put non-ctx manifests in the cache, so
-            # skip those since they don't implement the full api.
-            if (isinstance(cachemf, manifestctx) or
-                isinstance(cachemf, treemanifestctx)):
-                return cachemf
+            return self._dirmancache[dir][node]
 
         if dir:
             if self._revlog._treeondisk: