rbtree: Undo augmented trees performance damage and regression