diff --git a/cmd/multiproduct_kati/main.go b/cmd/multiproduct_kati/main.go
index 21d8383..d52c169 100644
--- a/cmd/multiproduct_kati/main.go
+++ b/cmd/multiproduct_kati/main.go
@@ -181,8 +181,7 @@
 					}
 					build.Build(product.ctx, product.config, buildWhat)
 					if !*keep {
-						// TODO: kati aborts from opendir while setting up the find emulator
-						//os.RemoveAll(product.config.OutDir())
+						os.RemoveAll(product.config.OutDir())
 					}
 					log.Println("Finished running for", product.config.TargetProduct())
 				}()
diff --git a/ui/build/kati.go b/ui/build/kati.go
index 86db887..f990767 100644
--- a/ui/build/kati.go
+++ b/ui/build/kati.go
@@ -73,20 +73,18 @@
 		"--regen",
 		"--ignore_optional_include=" + filepath.Join(config.OutDir(), "%.P"),
 		"--detect_android_echo",
+		"--color_warnings",
+		"--gen_all_targets",
+		"-f", "build/core/main.mk",
 	}
 
 	if !config.Environment().IsFalse("KATI_EMULATE_FIND") {
 		args = append(args, "--use_find_emulator")
 	}
 
-	// The argument order could be simplified, but currently this matches
-	// the ordering in Make
-	args = append(args, "-f", "build/core/main.mk")
-
 	args = append(args, config.KatiArgs()...)
 
 	args = append(args,
-		"--gen_all_targets",
 		"BUILDING_WITH_NINJA=true",
 		"SOONG_ANDROID_MK="+config.SoongAndroidMk(),
 		"SOONG_MAKEVARS_MK="+config.SoongMakeVarsMk())