Revert unicode changes from previous commit