Remove Unicode introduced in r205943