CLN: leftover rebasing from 405018c
Merge pull request #6823 from cpcloud/vbench-git-fix

CLN: leftover rebasing from 405018cf