reverted removal of client_domain in schema