Revert "Lock before unlock (2/2)"

This reverts commit 8bfd861e003387ba6c21f90378c821c09aea3bb5.

Change-Id: I9d6837f47673bb86e9fab7e4b0595077ca8a6653