diff -r 7d9b1b50cad5 -r 1b5880352314 mercurial/configitems.py
--- a/mercurial/configitems.py	Thu Sep 20 17:02:31 2018 +0800
+++ b/mercurial/configitems.py	Mon Sep 17 16:52:34 2018 +0800
@@ -456,9 +456,6 @@
 coreconfigitem('experimental', 'bundle2.pushback',
     default=False,
 )
-coreconfigitem('experimental', 'bundle2.stream',
-    default=False,
-)
 coreconfigitem('experimental', 'bundle2lazylocking',
     default=False,
 )
@@ -973,6 +970,10 @@
 coreconfigitem('server', 'bundle1gd.push',
     default=None,
 )
+coreconfigitem('server', 'bundle2.stream',
+    default=False,
+    alias=[('experimental', 'bundle2.stream')]
+)
 coreconfigitem('server', 'compressionengines',
     default=list,
 )