Revert "Merge pull request #235 from Meshfire/master"

This reverts commit 4b3c127d8906f5675fde52f3760c22d6a79b76b1, reversing
changes made to d29af2b692d05a0c3653a010f7e0d9329229ec8e.
Run build