--- a/mercurial/util.py	Fri Aug 12 11:35:17 2016 +0900
+++ b/mercurial/util.py	Sat Aug 13 12:08:23 2016 +0900
@@ -42,7 +42,6 @@
 import zlib
 
 from . import (
-    base85,
     encoding,
     error,
     i18n,
@@ -51,6 +50,7 @@
     pycompat,
 )
 
+base85 = policy.importmod(r'base85')
 osutil = policy.importmod(r'osutil')
 
 b85decode = base85.b85decode