Revert "Merge pull request #1 from eudoxia0/master"

This reverts commit 30275ff2a35f0be9fe2e36f9d8494e9a13ccee70, reversing
changes made to d62d215192188119a88c69f5e870c5c7446cb532.