Even more changes concerning r187426. Revised where locks are placed yet once again...