Revert "Merge pull request #4 from kclab/try_revert_merged_branch"

This reverts commit 4dd0ce6bf61ba06d3038edd678cde4267c84355d, reversing
changes made to 5f59c7bc8d286ee2646809a14936c7ebf033e18b.