Revert "Re-Enabled the commented out code in order to test if it is the cause of un-detachable attachements"

This reverts commit 486a2be14bdef07fce43cf0a378e63d33492ceaa.