Since it *will* be on PyPI, we'd better fix this.