BUG: revert 2/3 changes in vbsuite