Refactored blocks retry on delayed block retry