Revert "Merge pull request #229 from bjz/fix-build"

This reverts commit d212190fa35b0c5192565a4e3ac08be16ef8d235, reversing
changes made to 480433d8cb6b09142c67cf0044416026c6647c17.
Merge pull request #230 from alfredr/master

Revert "Merge pull request #229 from bjz/fix-build"