diff --git a/build.gradle b/build.gradle
index a959c94fe87..7e636b7631c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -423,14 +423,9 @@ task performance {
 }
 
 task clean {
+    dependsOn subprojects.collect { it.tasks.matching { it.name == "clean" } }
     doLast {
         delete distDir
         delete bundle.outputs.files
     }
 }
-
-// Don't run with other tasks (e.g. ./gradlew cleanAll bundle)
-task cleanAll {
-    // dependsOn gradle.includedBuilds.collect { it.task(":clean") }
-    dependsOn project.getTasksByName("clean", true)
-}