Reverted to previous locking schema