Revert "Revert "CNAMEs""

This reverts commit f44d49d1b6a08ab242a57dbbd4c7feb667d853ec.