Untangle the esi delivery and make it almost a set of plain VDPs.