This should be in a separate commit, for internationalization. No?