Revert "12310"
Merge pull request #7 from VWStudio/revert-6-master

Revert "12310"