Comment 5 for bug 1769556

I'll mark this verification-done as I did test it at the time (when the server did advertise branches). I think with Jean-Baptiste's confirmation that the tracks are correct then we should keep the change in case the server ever changed behaviour. I think the risk of this patch causing further issues is sufficiently low that it's not worth backing it out.