Revert fix which was causing deadlocks.