Revert "Woraround for unicode problem"

This reverts commit 1b0d997fac9179ca9d11003c088355fbb3f822ae.
As we found a solution to fix it