Reverted changes for fixing "UnicodeEncodeError".