Fix a deadlock introduced by the changes made to TRQ-2083.