diff --git a/apps/Makefile b/apps/Makefile
index da4dc6bba..ef4ee2b76 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -65,9 +65,6 @@ language_preferences = apps/language_preferences.csv
 SFLAGS += -I$(BUILD_DIR)
 
 i18n_files += $(addprefix apps/language_,$(addsuffix .universal.i18n, $(EPSILON_I18N)))
-ifeq ($(EPSILON_GETOPT),1)
-i18n_files += $(addprefix apps/language_,$(addsuffix _iso6391.universal.i18n, $(EPSILON_I18N)))
-endif
 
 i18n_files += $(call i18n_with_universal_for,shared)
 i18n_files += $(call i18n_with_universal_for,toolbox)
@@ -77,7 +74,7 @@ $(eval $(call rule_for, \
   I18N, \
   apps/i18n.cpp, \
   $(i18n_files), \
-  $$(PYTHON) apps/i18n.py --codepoints $(code_points) --countrypreferences $(country_preferences) --languagepreferences $(language_preferences) --header $$(subst .cpp,.h,$$@) --implementation $$@ --locales $$(EPSILON_I18N) --countries $$(EPSILON_COUNTRIES) --files $$^ --generateISO6391locales $$(EPSILON_GETOPT), \
+  $$(PYTHON) apps/i18n.py --codepoints $(code_points) --countrypreferences $(country_preferences) --languagepreferences $(language_preferences) --header $$(subst .cpp,.h,$$@) --implementation $$@ --locales $$(EPSILON_I18N) --countries $$(EPSILON_COUNTRIES) --files $$^, \
   global \
 ))
 
diff --git a/apps/i18n.py b/apps/i18n.py
index d03ec1ede..c1bdb41d6 100644
--- a/apps/i18n.py
+++ b/apps/i18n.py
@@ -23,13 +23,9 @@ parser.add_argument('--codepoints', help='the code_points.h file')
 parser.add_argument('--countrypreferences', help='the country_preferences.csv file')
 parser.add_argument('--languagepreferences', help='the language_preferences.csv file')
 parser.add_argument('--files', nargs='+', help='an i18n file')
-parser.add_argument('--generateISO6391locales', type=int, nargs='+', help='whether to generate the ISO6391 codes for the languages (for instance "en" for english)')
 
 args = parser.parse_args()
 
-def generate_ISO6391():
-    return args.generateISO6391locales[0] == 1
-
 def has_glyph(glyph):
     return glyph in codepoints
 
@@ -196,13 +192,6 @@ def print_header(data, path, locales, countries):
             lambda arg: arg.upper(),
             "  Message::Language")
 
-    if generate_ISO6391():
-        print_block_from_list(f,
-                "constexpr const Message LanguageISO6391Names[NumberOfLanguages] = {\n",
-                locales,
-                lambda arg: arg.upper(),
-                "  Message::LanguageISO6391")
-
     # Countries enumeration
     print_block_from_list(f,
             "enum class Country : uint8_t {\n",
@@ -236,6 +225,12 @@ def print_header(data, path, locales, countries):
         f.write(line[:-2] + "),\n")
     f.write("};\n\n")
 
+    # Language ISO639-1 codes
+    f.write("constexpr const char * LanguageISO6391Codes[NumberOfLanguages] = {\n");
+    for locale in locales:
+        f.write("  \"" + locale + "\",\n")
+    f.write("};\n\n")
+
     f.write("}\n\n")
     f.write("#endif\n")
     f.close()
diff --git a/apps/language_de_iso6391.universal.i18n b/apps/language_de_iso6391.universal.i18n
deleted file mode 100644
index 8d811650d..000000000
--- a/apps/language_de_iso6391.universal.i18n
+++ /dev/null
@@ -1 +0,0 @@
-LanguageISO6391DE = "de"
diff --git a/apps/language_en_iso6391.universal.i18n b/apps/language_en_iso6391.universal.i18n
deleted file mode 100644
index 54972ae84..000000000
--- a/apps/language_en_iso6391.universal.i18n
+++ /dev/null
@@ -1 +0,0 @@
-LanguageISO6391EN = "en"
diff --git a/apps/language_es_iso6391.universal.i18n b/apps/language_es_iso6391.universal.i18n
deleted file mode 100644
index 615cbf978..000000000
--- a/apps/language_es_iso6391.universal.i18n
+++ /dev/null
@@ -1 +0,0 @@
-LanguageISO6391ES = "es"
diff --git a/apps/language_fr_iso6391.universal.i18n b/apps/language_fr_iso6391.universal.i18n
deleted file mode 100644
index 905e6f179..000000000
--- a/apps/language_fr_iso6391.universal.i18n
+++ /dev/null
@@ -1 +0,0 @@
-LanguageISO6391FR = "fr"
diff --git a/apps/language_it_iso6391.universal.i18n b/apps/language_it_iso6391.universal.i18n
deleted file mode 100644
index 6a72c7216..000000000
--- a/apps/language_it_iso6391.universal.i18n
+++ /dev/null
@@ -1 +0,0 @@
-LanguageISO6391IT = "it"
diff --git a/apps/language_nl_iso6391.universal.i18n b/apps/language_nl_iso6391.universal.i18n
deleted file mode 100644
index 0fef88fd0..000000000
--- a/apps/language_nl_iso6391.universal.i18n
+++ /dev/null
@@ -1 +0,0 @@
-LanguageISO6391NL = "nl"
diff --git a/apps/language_pt_iso6391.universal.i18n b/apps/language_pt_iso6391.universal.i18n
deleted file mode 100644
index 15218e760..000000000
--- a/apps/language_pt_iso6391.universal.i18n
+++ /dev/null
@@ -1 +0,0 @@
-LanguageISO6391PT = "pt"
diff --git a/apps/main.cpp b/apps/main.cpp
index 3a22fda5c..bb8776af0 100644
--- a/apps/main.cpp
+++ b/apps/main.cpp
@@ -36,7 +36,7 @@ void ion_main(int argc, const char * const argv[]) {
         continue;
       }
       for (int j = 0; j < I18n::NumberOfLanguages; j++) {
-        if (strcmp(requestedLanguageId, I18n::translate(I18n::LanguageISO6391Names[j])) == 0) {
+        if (strcmp(requestedLanguageId, I18n::LanguageISO6391Codes[j]) == 0) {
           GlobalPreferences::sharedGlobalPreferences()->setLanguage((I18n::Language)j);
           GlobalPreferences::sharedGlobalPreferences()->setCountry(I18n::DefaultCountryForLanguage[j]);
           break;