Revert "Merge pull request #74 from thinkpunk/master"

This reverts commit 27d7c4d577f841b8f596fa8701bb2c83d4b98620, reversing
changes made to e2de7e1ce300842159de17a30dc133e3a349d3d9.