Also support legacy delayed delivery.