This is sub-optimal but let's rebuild the whole tree for now, since this case gets quite complicated and there are more valuable things to chase after first. Thanks to Gingeh for the reduced test case!
