BUG-865: remove use of DefaultDataTreeCandidate