Small cleanup of FQDN patch

Please accept this, it will propagate to PR #1