TRQ-1784. Fix a deadlock on this issue.