Most of the expensive redelivery operations have been moved to the `Redelivery` actor which is not on the critical path but I had to leave this one here. Ok if we're doing further optimizations with a separate ticket?