Revert "additional domainless changes (untested)"

This reverts commit ea766740d816a424115866e5486dd73247fcb6bb.