wip for pypy compatibility

Change-Id: I87a7c585e38a1c3e3f17785f16c8081965ab146e