SI-7284 TypeTree.setOriginal no longer NPEs