Revert changes to _tree_next, because we now use tree_simple_next anyway.