--- a/mercurial/hgweb/hgwebdir_mod.py	Thu Mar 08 15:15:59 2018 -0800
+++ b/mercurial/hgweb/hgwebdir_mod.py	Thu Mar 08 15:14:32 2018 -0800
@@ -509,8 +509,7 @@
         if style == styles[0]:
             vars['style'] = style
 
-        start = r'&' if url[-1] == r'?' else r'?'
-        sessionvars = webutil.sessionvars(vars, start)
+        sessionvars = webutil.sessionvars(vars, r'?')
         logourl = config('web', 'logourl')
         logoimg = config('web', 'logoimg')
         staticurl = config('web', 'staticurl') or url + 'static/'