r24804: As a temporary workaround, also try to guess the server's principal in the