#13249: Fix stripping attachments