Revert "Merge pull request #433 from bolinfest/master"

This reverts commit d0ce7319b811b03d520f088c53e4e0d9c1d024ed.