Revert to previous way to manage renamed branch
Better perf when getting branches