Change OTP callback to be more broken

Previously application threads were being marked as application threads, clearly did not want that. The question is:
is the current method any better? Who knows?