Refix ancestry changes reverted by pull request