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

This reverts commit aef2b74d2f5b89a743f9d2914488de2c7c89458b, reversing
changes made to 5f59c7bc8d286ee2646809a14936c7ebf033e18b.