Undone my (string) change in this pull request

So we can discuss them separately