[jggimi]

Yes. But you won't need -r after establishing the tree. Tags are "sticky."

(The out-of-date problem was fixed on October 11. In -current. The change may have been too extensive to be backported to -stable.)