Revert "Forward attachments"

This reverts commit c7bad93f229e8e38280c9f9df6fd9f2bd16263a7.