diff --git a/infer/models/c/Makefile b/infer/models/c/Makefile
index 8656ef114..80fbf3a67 100644
--- a/infer/models/c/Makefile
+++ b/infer/models/c/Makefile
@@ -16,7 +16,7 @@ all: install
 $(INFER_RESULTS): $(C_MODELS_SOURCES) $(CLANG_DEPS_NO_MODELS)
 #	make clean in src/ to recompile all the models
 	$(QUIET)$(call silent_on_success,Building C models,\
-	  $(INFER_BIN) -o $(@D) --models-mode --no-failures-allowed -- $(MAKE) -C src clean all)
+	  $(INFER_BIN) -o $(@D) --models-mode -- $(MAKE) -C src clean all)
 
 $(C_MODELS_FILE): $(INFER_RESULTS)
 	$(QUIET)$(INSTALL_DATA) $(dir $(INFER_RESULTS))/specs/*.specs $(SPECS_LIB_DIR)
diff --git a/infer/models/cpp/Makefile b/infer/models/cpp/Makefile
index 2d4157301..896e79045 100644
--- a/infer/models/cpp/Makefile
+++ b/infer/models/cpp/Makefile
@@ -18,7 +18,7 @@ all: install
 $(INFER_RESULTS): $(MODELS_SOURCES) $(CLANG_DEPS_NO_MODELS)
 #	make clean in src/ to recompile all the models
 	$(QUIET)$(call silent_on_success,Building C++ models,\
-	  $(INFER_BIN) -o $(@D) --models-mode --no-failures-allowed -- $(MAKE) -C src clean all)
+	  $(INFER_BIN) -o $(@D) --models-mode -- $(MAKE) -C src clean all)
 
 $(CPP_MODELS_FILE): $(INFER_RESULTS)
 	$(QUIET)$(INSTALL_DATA) $(dir $(INFER_RESULTS))/specs/*.specs $(SPECS_LIB_DIR)
diff --git a/infer/models/objc/Makefile b/infer/models/objc/Makefile
index cabdcc21b..7a82641e1 100644
--- a/infer/models/objc/Makefile
+++ b/infer/models/objc/Makefile
@@ -16,7 +16,7 @@ all: install
 $(INFER_RESULTS): $(OBJC_MODELS_SOURCES) $(CLANG_DEPS_NO_MODELS)
 # make clean in src/ to recompile all the models
 	$(QUIET)$(call silent_on_success,Building Objective-C models,\
-	  $(INFER_BIN) -o $(@D) --models-mode --no-failures-allowed -- $(MAKE) -C src clean all)
+	  $(INFER_BIN) -o $(@D) --models-mode -- $(MAKE) -C src clean all)
 
 $(OBJC_MODELS_FILE): $(INFER_RESULTS)
 	$(QUIET)$(INSTALL_DATA) $(dir $(INFER_RESULTS))/specs/*.specs $(SPECS_LIB_DIR)
diff --git a/infer/src/base/Config.ml b/infer/src/base/Config.ml
index 06ae6cb50..12137cf96 100644
--- a/infer/src/base/Config.ml
+++ b/infer/src/base/Config.ml
@@ -817,6 +817,7 @@ and ( bo_debug
     , frontend_tests
     , keep_going
     , linters_developer_mode
+    , models_mode
     , only_cheap_debug
     , print_buckets
     , print_logs
@@ -919,6 +920,9 @@ and ( bo_debug
       ~in_help:CLOpt.([(Capture, manual_clang)])
       "Save filename.ext.test.dot with the cfg in dotty format for frontend tests (also sets $(b,--print-types))"
       [print_types] []
+  and models_mode =
+    CLOpt.mk_bool_group ~long:"models-mode" "Mode for analyzing the models" []
+      [failures_allowed; keep_going]
   and print_logs =
     CLOpt.mk_bool ~long:"print-logs"
       ~in_help:
@@ -955,6 +959,7 @@ and ( bo_debug
   , frontend_tests
   , keep_going
   , linters_developer_mode
+  , models_mode
   , only_cheap_debug
   , print_buckets
   , print_logs
@@ -1230,10 +1235,6 @@ and ml_buckets =
 |}
     ~symbols:ml_bucket_symbols ~eq:PVariant.( = )
 
-and models_mode =
-  CLOpt.mk_bool ~deprecated:["models_mode"; "-models_mode"] ~long:"models-mode"
-    "Mode for analyzing the models"
-
 and modified_targets =
   CLOpt.mk_path_opt ~deprecated:["modified_targets"] ~long:"modified-targets" ~meta:"file"
     "Read the file of Buck targets modified since the last analysis"