Remove wrappers for a component tree field.

Closes #3520487

Merge request reports

Loading