Restore pypy-2.0.2 compatibility