Revert "cname issues"

This reverts commit b6196033c9ec04cab971f3aa22557067e4d76c64.