Revert "Merge pull request #67 in ZP/z-push from bugfix/ZP-726-infinit-loop-if-non-stream-given-for-an-attachment to develop"

This reverts commit 16800140.