Switch to sessionId instead of requestId.