We'll need more hostname-related code changes in the future, but for now this will solve a Cloudflare customer's existing bug report.