Allow VS builds to be speedy again.
Merge pull request #134 from shuffle2/fix-vs-build

Allow VS builds to be speedy again