Merge "Remove conditional on external_fixed_ips to allow for case that it is not...