This doesn't solve the deadlock problem, however.