Revert "Merge pull request #13 from tjchambers/master"

This reverts commit ae8170fdd76c757c9cec75aeed97136b5703048e, reversing
changes made to 9b1ca7a355f9455dc3e53aae83afc3b4cdf4e87e.