Once #68 is done, run a migration to clean up existing references.
Once #68 is done, run a migration to clean up existing references.