Revert some of #18915 changes (search box)

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