Switch to using a block instead of CK2AuthenticationChallengeTrampoline

MASSIVELY simpler!