Revert "Merge pull request #82 from bleistivt/master"

This reverts commit e74bf47c08cff288ffd16986df04e7ab75662027, reversing
changes made to 12229e3d6002329a8c816f1818eb4942136f69ff.