diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 2087332..f64f3a2 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -14,8 +14,6 @@ Version 0.15
 
 - Deprecated syntax for configuration values is now completely rejected. All
   values now have to be valid JSON.
-- The default of ``--list`` for ``vdirsyncer discover`` has changed to
-  ``false``. See :ghpr:`543`.
 - A few UX improvements for Google storages, see :gh:`549` and :gh:`552`.
 
 Version 0.14.1
diff --git a/vdirsyncer/cli/__init__.py b/vdirsyncer/cli/__init__.py
index d3f2779..45004c1 100644
--- a/vdirsyncer/cli/__init__.py
+++ b/vdirsyncer/cli/__init__.py
@@ -172,11 +172,10 @@ def metasync(ctx, collections, max_workers):
 @app.command()
 @click.argument('pairs', nargs=-1)
 @click.option(
-    '--list/--no-list', default=False,
+    '--list/--no-list', default=True,
     help=(
         'Whether to list all collections from both sides during discovery, '
-        'for debugging. This is slow and may crash for broken servers, so it '
-        'is disabled by default.'
+        'for debugging. This is slow and may crash for broken servers.'
     )
 )
 @max_workers_option(default=1)