Revert "Merge pull request #12 from lanafrost/master"

This reverts commit 2038be2d3174347c48da1458dfd1f4ad462f0b5e, reversing
changes made to c9d8644a1f8a06074bc4d730b678b808702144ec.