Revert "Merge pull request #8 from darnould/my_feature1"

This reverts commit ba82fbdbaa8f00ea55866f51be368cb8311ed499, reversing
changes made to 2316627f0493cb811b93cfca8dee1bd69385a291.