Changing 'node_info' to 'ancestors' as that's all we're getting now.
Merge remote-tracking branch 'upstream/master'