Revert "Merge pull request #13 from darnould/a_feature_4"

This reverts commit 0ae1e9b98b21d8ea584df260c0b4be344e5ef4e5, reversing
changes made to 6a9bae36513bbcaf3ea75517f786540de4cbbc88.