diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index aaa2721c..bdc96826 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -115,7 +115,6 @@ phutil_register_library_map(array(
     'ArcanistPhutilXHPASTLinterTestCase' => 'lint/linter/__tests__/ArcanistPhutilXHPASTLinterTestCase.php',
     'ArcanistPyFlakesLinter' => 'lint/linter/ArcanistPyFlakesLinter.php',
     'ArcanistPyLintLinter' => 'lint/linter/ArcanistPyLintLinter.php',
-    'ArcanistRepoUtilsTestCase' => 'repository/util/__tests__/ArcanistRepoUtilsTestCase.php',
     'ArcanistRepositoryAPI' => 'repository/api/ArcanistRepositoryAPI.php',
     'ArcanistRepositoryAPIMiscTestCase' => 'repository/api/__tests__/ArcanistRepositoryAPIMiscTestCase.php',
     'ArcanistRepositoryAPIStateTestCase' => 'repository/api/__tests__/ArcanistRepositoryAPIStateTestCase.php',
@@ -167,8 +166,6 @@ phutil_register_library_map(array(
   ),
   'function' =>
   array(
-    'hgsprintf' => 'repository/util/hgsprintf.php',
-    'xsprintf_mercurial' => 'repository/util/hgsprintf.php',
   ),
   'xmap' =>
   array(
@@ -179,7 +176,7 @@ phutil_register_library_map(array(
     'ArcanistArcanistLinterTestCase' => 'ArcanistLinterTestCase',
     'ArcanistBaseCommitParserTestCase' => 'ArcanistTestCase',
     'ArcanistBaseWorkflow' => 'Phobject',
-    'ArcanistBaseXHPASTLinter' => 'ArcanistLinter',
+    'ArcanistBaseXHPASTLinter' => 'ArcanistFutureLinter',
     'ArcanistBookmarkWorkflow' => 'ArcanistFeatureWorkflow',
     'ArcanistBranchWorkflow' => 'ArcanistFeatureWorkflow',
     'ArcanistBritishTestCase' => 'ArcanistTestCase',
@@ -251,7 +248,6 @@ phutil_register_library_map(array(
     'ArcanistPhutilXHPASTLinterTestCase' => 'ArcanistArcanistLinterTestCase',
     'ArcanistPyFlakesLinter' => 'ArcanistLinter',
     'ArcanistPyLintLinter' => 'ArcanistLinter',
-    'ArcanistRepoUtilsTestCase' => 'ArcanistTestCase',
     'ArcanistRepositoryAPIMiscTestCase' => 'ArcanistTestCase',
     'ArcanistRepositoryAPIStateTestCase' => 'ArcanistTestCase',
     'ArcanistRubyLinter' => 'ArcanistLinter',
diff --git a/src/repository/util/__tests__/ArcanistRepoUtilsTestCase.php b/src/repository/util/__tests__/ArcanistRepoUtilsTestCase.php
deleted file mode 100644
index 0204eff9..00000000
--- a/src/repository/util/__tests__/ArcanistRepoUtilsTestCase.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-final class ArcanistRepoUtilsTestCase extends ArcanistTestCase {
-
-  public function testhgsprintf() {
-    $this->assertEqual(
-      "'version-1'",
-      hgsprintf('%s', 'version-1'));
-
-    $this->assertEqual(
-      "'single\\'quote'",
-      hgsprintf('%s', "single'quote"));
-
-    $this->assertEqual(
-      "'back\\\\slash'",
-      hgsprintf('%s', 'back\\slash'));
-
-    $this->assertEqual(
-      "'33%'",
-      hgsprintf('%R', hgsprintf('%s', '33%')));
-  }
-
-}
diff --git a/src/repository/util/hgsprintf.php b/src/repository/util/hgsprintf.php
deleted file mode 100644
index da456647..00000000
--- a/src/repository/util/hgsprintf.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Format a Mercurial revset expression. Supports the following conversions:
- *
- *  %s Symbol
- *    Escapes a Mercurial symbol, like a branch or bookmark name.
- *
- *  %R Rrraw Rreferrrence / Rrrrevset
- *    Passes text through unescaped (e.g., an already-escaped revset).
- *
- * @group mercurial
- */
-function hgsprintf($pattern /* , ... */) {
-  $args = func_get_args();
-  return xsprintf('xsprintf_mercurial', null, $args);
-}
-
-
-/**
- * xsprintf() callback for Mercurial encoding.
- *
- * @group mercurial
- */
-function xsprintf_mercurial($userdata, &$pattern, &$pos, &$value, &$length) {
-
-  $type = $pattern[$pos];
-
-  switch ($type) {
-    case 's':
-      $value = "'".addcslashes($value, "'\\")."'";
-      break;
-    case 'R':
-      $type = 's';
-      break;
-  }
-
-  $pattern[$pos]  = $type;
-}