Reverted to previous version

... to handle unicode scalars