Revert #10 because that pull request is incomplete