CLN/BUG: Revert 2/3 compat changes to vb_suite