diff --git a/infer/lib/python/infer.py b/infer/lib/python/infer.py
index 54d63377f..2691ec42b 100755
--- a/infer/lib/python/infer.py
+++ b/infer/lib/python/infer.py
@@ -199,14 +199,5 @@ def main():
         global_argparser.print_help()
         sys.exit(os.EX_OK)
 
-    buck_not_in_compilation_database_mode =  \
-        mod_name == 'buck' and not args.use_compilation_database
-    if not (buck_not_in_compilation_database_mode or
-            mod_name == 'javac' or
-            mod_name == 'java'):
-        analysis = analyze.AnalyzerWrapper(args)
-        analysis.analyze_and_report()
-        analysis.save_stats()
-
 if __name__ == '__main__':
     main()
diff --git a/infer/src/backend/infer.ml b/infer/src/backend/infer.ml
index 06a012497..b7f8e0215 100644
--- a/infer/src/backend/infer.ml
+++ b/infer/src/backend/infer.ml
@@ -247,9 +247,6 @@ let report () =
       Unix.waitpid (Unix.create_process ~prog ~args).pid |> ignore
 
 let analyze = function
-  | Ant | Gradle | Make | Mvn | Ndk | Xcode ->
-      (* Still handled by infer.py through capture function above *)
-      ()
   | Buck when Config.use_compilation_database = None ->
       (* In Buck mode when compilation db is not used, analysis is invoked either from capture or a
          separate Analyze invocation is necessary, depending on the buck flavor used. *)
@@ -257,7 +254,7 @@ let analyze = function
   | Java | Javac ->
       (* In Java and Javac modes, analysis is invoked from capture. *)
       ()
-  | Analyze | Buck | ClangCompilationDatabase ->
+  | Analyze | Ant | Buck | ClangCompilationDatabase | Gradle | Make | Mvn | Ndk | Xcode ->
       if not (Sys.file_exists Config.(results_dir // captured_dir_name)) then (
         L.err "There was nothing to analyze, exiting" ;
         Config.print_usage_exit ()