Revert "cleanup BlockBreaker"

This reverts commit 29bd5f1893d6323da36bc8590461275cf163a5d4.