Revert "bugfix attachment bug"

This reverts commit 42bb2187a281132112a7ae7d05f39359c45fc27a.