Merging postreleasefix/85 to master
Merging postreleasefix/85 to master

* postreleasefix/85:
  Revert "Fix #ENSWEB-2672 Fix Location Navbar functionality"

Ensembl/ensembl-webcode,Ensembl/ensembl-webcode,Ensembl/ensembl-webcode,Ensembl/ensembl-webcode,Ensembl/ensembl-webcode