Keep Revamp TokenListener as OAuth2 specific.