Moved the logic to remove www from Site.domain into current_site_domain to fix issues reversing URLs when Site.domain has a www.