Revert "Merge pull request #146 from acmetech/master"

This reverts commit e2f2dcd00074766c9f33d3a4499956993ac6d368, reversing
changes made to 517eda4032006be5606681ebb7f2f872b860692c.