Revert "Fix temporary pypy gate issue with setuptools"

This reverts commit 0972c76a7734fd1f307f239fdd858d12ddde1cab
Merge "Revert "Fix temporary pypy gate issue with setuptools""