Reverted previous CNAME reversion.

Change-Id: I1d0304705864139eb7be9176fba3237c72f45c43