Revert "Try defaulting to the domain for real"

This reverts commit 925f684db8edba4278d2b2bb310f48f993e45094.