BUG: revert 2/3 changes in vbsuite

Fixes #4477,  #4474