Revert #20 because that pull request is incomplete