Revert "Merge pull request #4 from toshimaru/branch3"

This reverts commit 145926719e955eb859015008e13d2cbd7f2a2cd9, reversing
changes made to b536b3de7753a3aa0f3d2dec8b6e382a6840c083.