Merge "Remove IV auto-generation workaround."