This reverts commit 07f807f12c0949e9deeee09b4a28bb1f810b26ca because it requires a python-pluggy update which seems to cause some issues.
This reverts commit 07f807f12c0949e9deeee09b4a28bb1f810b26ca because it requires a python-pluggy update which seems to cause some issues.