Revert "Better checks when connecting a domain"

This reverts an earlier release towards domain checks.