Revert "[OE-4385] update iop graph to match va graph"

This reverts commit 9660bcc85b168a7f49a169ac77e7c4eb63795ec2.
[OE-4385] update va to match iop