This is not a solution. This is a workaround that we already had. This does not allow "Delayed Delivery"
