More consistent resolution backtracking by removing legacy hack related to setuptools resolution