Revert "Merge pull request #15 from darnould/a_feature_6"

This reverts commit e0afa2996705827a972303a9149b2bcc4e8c626b, reversing
changes made to 857fb5aa65473d7e0e2eaa334f1493d402b028e0.