Revert "reduce lock granularity"

This reverts commit e6c925f105eada157fb0b6f64ddb41a3264dea60.