Fix a deadlock introduced by 5c2e3bf7 by using a separate low level lock to procect...