Mostly a revert of spnego handling