Revert "Change pip and setup tools upgrade order"

This reverts commit d696aaf2e5044d6eaa055e88a6e76a67bc039117.