Revert "More CNAME messing"

This reverts commit e9a4710bcc2711913a3e2a8427cd52b1d73f0818.