Goodbye extra_unique_id, you were useful while you lasted.