b7ebc4765a
This reverts commit 3b782d304ec2073a6406c37b9e1a76c8aecfc9a3. The blockers for setuptools 8 compatibility should all be resolved now. Change-Id: I6d2d63746f98f0f885816395f36022a2706fb9c5