This seems unrelated to the unicode changes.