Final hotfix for flakes, if this doesn't work then I'll dive into
figuring out the root cause. Now we wait 30 seconds and only continue if
we haven't seen a reorg for the full 30 seconds.