Revert "This reverts commit 1c5cb4f334"

This reverts commit aab6e3c2e79659c609ae56e3dda3d807b9cd0451, and
reapplies the synchronization of the HashSet b in BlockRestoneWire