Revert "Revert "CNAME (again)""

This reverts commit 2cd176c09db912044b15c5c22b3c0eba8bd449b8.