Reintroduce more chan_vpb stuff that was removed in r100421 and r100422