Revert "Temporarily remove cname"

This reverts commit 6a325a6783e9d920df882bf8d15121c1990abddb.