Removed now unnecesary workaround for PyPy

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