Revert 9b18bf8, this broke host-only sessions