getting rid of the safe_component workaround