Revert "Almost there. Simplifying life for the build process."
Revert "Almost there. Simplifying life for the build process."

This reverts commit a02a7ed2a02d291b0350a55d52311e15880ec054.

jjphatt/polywog-dev,jjphatt/polywog-dev,jjphatt/polywog-dev