BUG: revert 2/3 changes in vbsuite

Might fix #4477 - @y-p can you try it?