Revert some of #18915 changes (search box)

Following legacy/trac#21309 (moved), we may be able to revert some of the legacy/trac#18915 (moved) changes.