diff --git a/master.cfg b/master.cfg
index d61651c..6da108e 100644
--- a/master.cfg
+++ b/master.cfg
@@ -1074,9 +1074,10 @@ The parameters of the class are:
         # This last will be executed when the build succeeds.  It is
         # needed in order to cleanup the breakage lockfile, if it
         # exists.
-#        self.addStep (steps.MasterShellCommand (command = [ 'rm', '-f',
-#                                                            util.Interpolate ('/tmp/gdb-buildbot-breakage-report-*-%(prop:branch)s-%(prop:buildername)s') ],
-#                                                hideStepIf = True))
+        self.addStep (steps.MasterShellCommand (command = [ 'rm', '-f',
+                                                            util.Interpolate ('/tmp/gdb-buildbot-breakage-report-%(prop:branch)s-%(prop:buildername)s') ],
+                                                hideStepIf = True,
+                                                doStepIf = scheduler_is_not_racy_try_do))
 
         # Disabling this until we figure out how to properly run + test
 #        self.addStep (MakeTAGSGDB ())