Reverting the revert of CNAME