Revert r362360.
This commit was simply wrong since two different objects are locked.
Reported by: lwhsu, pho Pointy hat: markj