Revert "Issue #2898903 by tetranz, alexpott, smustgrave, immaculatexavier,...
Revert "Issue #2898903 by tetranz, alexpott, smustgrave, immaculatexavier, prasanth_kp, timmillwood, vinaymahale, rajandro: Terms lose <root> as the parent when editing"
This reverts commit f035d25c.