(#3092) - correctly handle attachments when _deleted