diff --git a/core/src/main/java/jenkins/model/RunIdMigrator.java b/core/src/main/java/jenkins/model/RunIdMigrator.java
index 0315eb5fb16d53d359557bbc2f9d20ebe91be406..88dc17b90026101b0a75a3abdca21bd1b8bab760 100644
--- a/core/src/main/java/jenkins/model/RunIdMigrator.java
+++ b/core/src/main/java/jenkins/model/RunIdMigrator.java
@@ -352,8 +352,10 @@ public final class RunIdMigrator {
         for (File job : jobDirs) {
 
             if (job.getName().equals("builds")) {
+                // Might be maven modules, matrix builds, etc. which are direct children of job
                 unmigrateBuildsDir(job);
             }
+
             File[] kids = job.listFiles();
             if (kids == null) {
                 continue;
@@ -365,7 +367,8 @@ public final class RunIdMigrator {
                 if (kid.getName().equals("builds")) {
                     unmigrateBuildsDir(kid);
                 } else {
-                    // Might be jobs, modules, promotions, etc.; we assume an ItemGroup.getRootDirFor implementation returns grandchildren.
+                    // Might be jobs, modules, promotions, etc.; we assume an ItemGroup.getRootDirFor implementation
+                    // returns grandchildren, unmigrateJobsDir(job) call above handles children.
                     unmigrateJobsDir(kid);
                 }
             }