Revert "Merge pull request #17 from darnould/a_feature_8"

This reverts commit 932828f1d199c71f3e65028f90899618b73304e6, reversing
changes made to f993efba851069c4c397d9351d12be29ebfe8993.