Rolled back unicode fix