Revert "Merge pull request #12 from darnould/a_feature_3"

This reverts commit 55f74abab9e111284b5812da2b8c6d71caaf52f0, reversing
changes made to 0c3135d2e17069b1099404604623440933d63897.