Revert the revert and fix domain server

@murillodigital