I don't know whether you need the pva section at all anymore but do feel like it's a bit of a separate issue to this.

Originally posted by @dperl-dls in#1200 (comment)