Make use1 and usw2 equivalent again, now that link issues are mostly sorted out. r=doit