[FIX] non-renamed branches path handling

Is there *really* a need for them to keep working?