--- a/mercurial/templates/paper/search.tmpl	Fri Jun 09 23:56:50 2017 -0400
+++ b/mercurial/templates/paper/search.tmpl	Fri Jun 09 13:59:13 2017 -0700
@@ -33,11 +33,7 @@
 Use {showunforcekw}</a> instead.')}
 </p>
 
-<form class="search" action="{url|urlescape}log">
-{sessionvars%hiddenformentry}
-<p><input name="rev" id="search1" type="text" size="30" value="{query|escape}"></p>
-<div id="hint">{searchhint}</div>
-</form>
+{searchform}
 
 <div class="navigate">
 <a href="{url|urlescape}log{lessvars%urlparameter}">less</a>