Revert "Merge pull request #2 from yanoh/branch"

This reverts commit 66c5b27d0140d531a02601876d8c4f34eafe20c1, reversing
changes made to 9464b79304a45dee8ac940611f22615993d17fa3.