Removed now unnecesary workaround for PyPy

Change-Id: I793108170a4fa847d351cf605bf2d01b0dd46822
Merge "Removed now unnecesary workaround for PyPy"