Fix broken component_instance

Temporary revert last changes