Removed now unnecesary workaround for PyPy

Related-bug: #1290562

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