CLN/BUG: Revert 2/3 compat changes to vb_suite
Merge pull request #4478 from jtratner/revert-vb-suite

BUG: revert 2/3 changes in vbsuite