Afghan peace deal heralds return of feared warlord