Revert "Merge pull request #38 from JamesKyburz/issue-37"

This reverts commit be59c9641f7726b299ce42094b96e46105e455d8, reversing
changes made to 2e5af2f92f93551f7267e638fcd04bb003dfacdf.