Revert "Experiment: Eagerly get strong lock"

This reverts commit 083bdb5771b1dbd280304c6e3e1f489b3f8f1b4c.
Tweak comments
tweak
Fix visibility bug