Merge "Revert "Workaround for new pip 20.3 behavior""