Fix issue where api_host is overwritten by merge

@createdbypete :eyes: