Reverted to prior commit based on unicode problems