Add support for pypy again