The previous commit overrode the block synchronization and double check
locking changes, fixing that.