Rolled back

Conflicts:
	CNAME