[int13] Pairwise swap drive numbers, instead of shifting all drive numbers