Revert part of commit 687d1b1b to avoid deadlock

There could happen a deadlock in the code due to this new lock
addition, thus betetr to remove it for now and wait for bug 745545.