Pre-unicode branch commit.