Avoid dependency on axiom-legacy-attachments
2 files changed