Move bulk requeue into the fetch strategy, #624