diff --git a/src/applications/diffusion/editor/DiffusionRepositoryEditEngine.php b/src/applications/diffusion/editor/DiffusionRepositoryEditEngine.php
index 688d78fcc5..a026e176fc 100644
--- a/src/applications/diffusion/editor/DiffusionRepositoryEditEngine.php
+++ b/src/applications/diffusion/editor/DiffusionRepositoryEditEngine.php
@@ -253,6 +253,11 @@ final class DiffusionRepositoryEditEngine
       }
     }
 
+    $track_instructions = pht(
+      'WARNING: The "Track Only" feature is deprecated. Use "Fetch Refs" '.
+      'and "Permanent Refs" instead. This feature will be removed in a '.
+      'future version of Phabricator.');
+
     return array(
       id(new PhabricatorSelectEditField())
         ->setKey('vcs')
@@ -376,17 +381,6 @@ final class DiffusionRepositoryEditEngine
         ->setConduitDescription(pht('Set the fetched refs.'))
         ->setConduitTypeDescription(pht('New fetched refs.'))
         ->setValue($fetch_value),
-      id(new PhabricatorTextAreaEditField())
-        ->setIsStringList(true)
-        ->setKey('trackOnly')
-        ->setLabel(pht('Track Only'))
-        ->setTransactionType(
-          PhabricatorRepositoryTrackOnlyTransaction::TRANSACTIONTYPE)
-        ->setIsCopyable(true)
-        ->setDescription(pht('Track only these branches.'))
-        ->setConduitDescription(pht('Set the tracked branches.'))
-        ->setConduitTypeDescription(pht('New tracked branches.'))
-        ->setValue($track_value),
       id(new PhabricatorTextAreaEditField())
         ->setIsStringList(true)
         ->setKey('permanentRefs')
@@ -398,6 +392,18 @@ final class DiffusionRepositoryEditEngine
         ->setConduitDescription(pht('Set the permanent refs.'))
         ->setConduitTypeDescription(pht('New permanent ref rules.'))
         ->setValue($permanent_value),
+      id(new PhabricatorTextAreaEditField())
+        ->setIsStringList(true)
+        ->setKey('trackOnly')
+        ->setLabel(pht('Track Only'))
+        ->setTransactionType(
+          PhabricatorRepositoryTrackOnlyTransaction::TRANSACTIONTYPE)
+        ->setIsCopyable(true)
+        ->setControlInstructions($track_instructions)
+        ->setDescription(pht('Track only these branches.'))
+        ->setConduitDescription(pht('Set the tracked branches.'))
+        ->setConduitTypeDescription(pht('New tracked branches.'))
+        ->setValue($track_value),
       id(new PhabricatorTextEditField())
         ->setKey('importOnly')
         ->setLabel(pht('Import Only'))
diff --git a/src/applications/diffusion/management/DiffusionRepositoryBranchesManagementPanel.php b/src/applications/diffusion/management/DiffusionRepositoryBranchesManagementPanel.php
index dbb1b1ed3a..6bd59432ea 100644
--- a/src/applications/diffusion/management/DiffusionRepositoryBranchesManagementPanel.php
+++ b/src/applications/diffusion/management/DiffusionRepositoryBranchesManagementPanel.php
@@ -37,8 +37,8 @@ final class DiffusionRepositoryBranchesManagementPanel
     return array(
       'defaultBranch',
       'fetchRefs',
-      'trackOnly',
       'permanentRefs',
+      'trackOnly',
     );
   }
 
@@ -90,12 +90,10 @@ final class DiffusionRepositoryBranchesManagementPanel
     }
 
     $track_only_rules = $repository->getTrackOnlyRules();
-    $track_only_rules = implode(', ', $track_only_rules);
-    $track_only = nonempty(
-      $track_only_rules,
-      phutil_tag('em', array(), pht('Track All Branches')));
-    $view->addProperty(pht('Track Only'), $track_only);
-
+    if ($track_only_rules) {
+      $track_only_rules = implode(', ', $track_only_rules);
+      $view->addProperty(pht('Track Only'), $track_only_rules);
+    }
 
     $publishing_disabled = $repository->isPublishingDisabled();
     if ($publishing_disabled) {
@@ -134,7 +132,6 @@ final class DiffusionRepositoryBranchesManagementPanel
       $rows = array();
       foreach ($branches as $branch) {
         $branch_name = $branch->getShortName();
-        $tracking = $repository->shouldTrackBranch($branch_name);
         $permanent = $repository->shouldAutocloseBranch($branch_name);
 
         $default = $repository->getDefaultBranch();
@@ -166,7 +163,6 @@ final class DiffusionRepositoryBranchesManagementPanel
           $icon,
           $branch_name,
           $status,
-          $tracking ? pht('Tracking') : pht('Off'),
           $permanent_status,
         );
       }
@@ -176,7 +172,6 @@ final class DiffusionRepositoryBranchesManagementPanel
           '',
           pht('Branch'),
           pht('Status'),
-          pht('Track'),
           pht('Permanent'),
         ));
       $branch_table->setColumnClasses(
@@ -184,7 +179,6 @@ final class DiffusionRepositoryBranchesManagementPanel
           '',
           'pri',
           'narrow',
-          'narrow',
           'wide',
         ));
       $branch_table->setColumnVisibility(
@@ -193,7 +187,6 @@ final class DiffusionRepositoryBranchesManagementPanel
           true,
           $can_close_branches,
           true,
-          true,
         ));
 
       $box = $this->newBox(pht('Branch Status'), $branch_table);