Revert "Merge pull request #657 from arthurnn/CNAME_option"

This reverts commit 4e9d797d452d9e8499eec67ffad3e4140fc22736, reversing
changes made to 07cdab61877cfed5b7c15e292cff6162e46d881c.