Undoing the :component designation

I’ve got a system that makes liberal use of :component. Like, I’ve got a report entity and it has component references to the many observations one may make on a report. Well and fine.

But I have also got report types which are composed of many section types. And the sections should be shareable and re-usable across many different types of reports. But alas, the section-types are components of the report-types. So if I remove a report type, it vanishes not just from that type, but everywhere in the system.

Is it possible to “undo” the :component designation, or am I stuck? I think in the past, similar mistakes were handled by creating a whole new entity with the correct/desired changes. But that has left me with all kinds of “red herrings” in the DB as I have to guess which of the similarly named entities is the actual one in use.