Removed now unnecesary workaround for PyPy

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