This join probably kills kittens too. We can delete it when we enable Persona some day.