Revert "Merge pull request #12 from gkandemi/test-john"

This reverts commit 20d4c3843f9076519f962dc631003bf48ab348d5, reversing
changes made to b9b4e395ea20a16d1bda62d5b7a5977515288ee4.