Revert "Merge pull request #70 from riobard/refactor/vbx"

This reverts commit 0fbe0f7d5d383b07d3804451e7ae0bfbc18abe04, reversing
changes made to ea966f98818c4bfba790627892527d3ca5c55c02.
Merge pull request #71 from SvenDowideit/revert-vbm-70

Revert "Merge pull request #70 from riobard/refactor/vbx"