I know the whole AttachmentManager thing is a bad idea, but I think we need to fix it rather than pushing it over the line even further with this linkage.