Break up dependency download in two steps