Manually pull in changes added by @alex in pypy