diff --git a/Assistant/WebApp/Configurators/Delete.hs b/Assistant/WebApp/Configurators/Delete.hs
index 54856b6ccc..8db07211c0 100644
--- a/Assistant/WebApp/Configurators/Delete.hs
+++ b/Assistant/WebApp/Configurators/Delete.hs
@@ -47,11 +47,6 @@ handleXMPPRemoval uuid nonxmpp = do
 		then deletionPage $ $(widgetFile "configurators/delete/xmpp")
 		else nonxmpp
 
-getDisableRepositoryR :: UUID -> Handler Html
-getDisableRepositoryR uuid = notCurrentRepo uuid $ handleXMPPRemoval uuid $ do
-	void $ liftAssistant $ disableRemote uuid
-	redirect DashboardR
-
 getDeleteRepositoryR :: UUID -> Handler Html
 getDeleteRepositoryR uuid = notCurrentRepo uuid $ handleXMPPRemoval uuid $ do
 	deletionPage $ do
diff --git a/Assistant/WebApp/routes b/Assistant/WebApp/routes
index 8d8d5c9326..ae2565ab5c 100644
--- a/Assistant/WebApp/routes
+++ b/Assistant/WebApp/routes
@@ -87,7 +87,6 @@
 /config/repository/reorder RepositoriesReorderR GET
 
 /config/repository/syncnow/#UUID SyncNowRepositoryR GET
-/config/repository/disable/#UUID DisableRepositoryR GET
 
 /config/repository/delete/confirm/#UUID DeleteRepositoryR GET
 /config/repository/delete/start/#UUID StartDeleteRepositoryR GET
diff --git a/debian/changelog b/debian/changelog
index e13e648e40..3ec572d04d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ git-annex (5.20150917) UNRELEASED; urgency=medium
   * info: Don't allow use in a non-git-annex repository, since it
     uses the git-annex branch and would create it if it were missing.
   * assistant: When updating ~/.ssh/config, preserve any symlinks.
+  * webapp: Remove the "disable remote" feature from the UI.
 
  -- Joey Hess <id@joeyh.name>  Wed, 16 Sep 2015 12:23:33 -0400
 
diff --git a/doc/forum/webapp:_disabling_a_paired_repository/comment_2_28cf58629b9774426c084d80964151d7._comment b/doc/forum/webapp:_disabling_a_paired_repository/comment_2_28cf58629b9774426c084d80964151d7._comment
new file mode 100644
index 0000000000..5d78439b67
--- /dev/null
+++ b/doc/forum/webapp:_disabling_a_paired_repository/comment_2_28cf58629b9774426c084d80964151d7._comment
@@ -0,0 +1,19 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 2"""
+ date="2015-09-21T16:55:47Z"
+ content="""
+Disabling a remote is a weak form of deleting it; the remote repository is
+left as-is, but the git remote is removed so git-annex won't sync with it,
+and the webapp won't show it.
+
+I don't know if it makes sense for the webapp to expose this possibility.
+It seems that it certianly doesn't makes sense to do it without getting
+confirmation, since to re-enable the repository, the user has to do some
+probably unknown to them process to set it back up.
+
+In your case, I think that re-doing the pairing process would get them back
+to how they were.
+
+On consideration, I am going to remove this feature from the webapp UI.
+"""]]
diff --git a/templates/repolist.hamlet b/templates/repolist.hamlet
index e3eeefe514..72a194b0ab 100644
--- a/templates/repolist.hamlet
+++ b/templates/repolist.hamlet
@@ -60,9 +60,6 @@
                       <a href="@{SyncNowRepositoryR $ asUUID repoid}">
                         <span .glyphicon .glyphicon-refresh>
                         \ Sync now
-                      <a href="@{DisableRepositoryR $ asUUID repoid}">
-                        <span .glyphicon .glyphicon-minus>
-                        \ Disable
                       <a href="@{DeleteRepositoryR $ asUUID repoid}">
                         <span .glyphicon .glyphicon-trash>
                         \ Delete