Reapply fix lost in SVN to git conversion