Revert "UnicodeEncodeErrors fix"

This reverts commit 1a8ec29e4ee6615ad6f92768e1b6b96d6f255d64.