Revert "Merge pull request #1671 from anthrotype/varlib-single-master-vf"

This reverts commit f3c99cfef211336a9c6921552462ee1661fbcede, reversing
changes made to 1dcb3c2bde86e9977bb384046e594e35ecd18796.
1 file changed