[CS] Maintain old API and move FQDN fallback closer to where it's needed