Fix the OperationCanceledException seen in TISTUD-4692.