Revert "Merge pull request #1 from Jesterovskiy/new_branch"

This reverts commit 5224ab61dc42261002603870da68502666e8a375, reversing
changes made to f95ef313103f11d0dad253a781461a022f9375f8.