Fix comparison tool by asking for blocks more aggressively

Rebased-from: b33b9a6fefbe832bf45a6c7717d0537f27597bff