Revert "CNAME (again)"

This reverts commit 16f5228727be036c5f390ea560221b5a0e1cd2c3.