yes, I think so. This will need to be revisited when we do subdomains properly.