Unicode fix didn't work. Reverting.