Revert "Merge branch 'fix/different-servers-different-server-vars' into 'develop'"
Revert "Merge branch 'fix/different-servers-different-server-vars' into 'develop'"

This reverts merge request !458
unikent/astro,unikent/astro,unikent/astro,unikent/astro,unikent/astro