Revert "Merge pull request #36 from jameskoster/release-1-2-0"

This reverts commit 6951cf5fffcc0377821375e1c322cdf0fc4dedcc, reversing
changes made to 25ebff067540e41064890f3a4e4918dbbb8154eb.