Removed now unnecesary workaround for PyPy

Change-Id: I259d5b779117e22869ea53b4208acc3ac1232689