25db7be Keep Revamp TokenListener as OAuth2 specific.