Issue #2325683 follow-up: No need for the entity dependency just yet, we can use entity_extract_ids to get the IDs