Reverted the pypy stuff - I think