Revert "Return sting issue fixed by using streams"

This reverts commit 98ab848e160495ffee20bc8a0e5492b934a9827a.