Revert "Encoding fixed"

This reverts commit 3fa41fadc48e0c6410658055738b342e3c1ba952.