Revert "use default lock design."

This reverts commit 84e8a59b31403828a82755603da08f253b49614d.