push-me-pull-you fix for fix that broke py3 by fixing pypy