Revert "Merge branch 'byrman_one-lock-less' into byrman"

This reverts commit f90568943bb6d8d86d5428f4334c526fd8c313b1, reversing
changes made to f657b73d6f1ab7c6f09128754da7aa93ded78af7.