Yeah, that check can go. The isAttachment() check needs to stay, though.