Revert "Oops, don't remove CNAME"

This reverts commit 6a4d4802a0c840e1540ecf57954359f87ad8992a.
Revert "Generate from 0"

This reverts commit 141d0b1f8805acc51548e641c98b0a56db34a8c2.