Revert breaking change.
Key route collection
Fix routing of domains.