Revert "make sure we have client_domain"

This reverts commit 91d8d9d73c2e2dd63ee9d0846395c1629bccf77f.