User should be able to select a user-created component and choose "Extract Component", and this will do the opposite of "make component", i.e. it will will break the component and show its content tree instead in the component's place.