undoing search nav "fix" which wasn't actually a fix
Merge branch 'develop' into release/alpha

* develop:
  undoing search nav "fix" which wasn't actually a fix
Merge branch 'release/alpha' into gh-pages

* release/alpha:
  undoing search nav "fix" which wasn't actually a fix