diff --git a/core/src/main/java/hudson/model/AsyncPeriodicWork.java b/core/src/main/java/hudson/model/AsyncPeriodicWork.java
index 3a02b56b0d5e20bad10e924c81d626e059dd2972..9444887b5b1c262818920df69006021e291e5559 100644
--- a/core/src/main/java/hudson/model/AsyncPeriodicWork.java
+++ b/core/src/main/java/hudson/model/AsyncPeriodicWork.java
@@ -3,8 +3,6 @@ package hudson.model;
 import hudson.security.ACL;
 import hudson.util.StreamTaskListener;
 import jenkins.model.Jenkins;
-import org.acegisecurity.context.SecurityContext;
-import org.acegisecurity.context.SecurityContextHolder;
 
 import java.io.File;
 import java.io.IOException;
@@ -36,6 +34,7 @@ public abstract class AsyncPeriodicWork extends PeriodicWork {
     /**
      * Schedules this periodic work now in a new thread, if one isn't already running.
      */
+    @SuppressWarnings("deprecation") // in this case we really want to use PeriodicWork.logger since it reports the impl class
     public final void doRun() {
         try {
             if(thread!=null && thread.isAlive()) {
diff --git a/core/src/main/java/hudson/model/FingerprintCleanupThread.java b/core/src/main/java/hudson/model/FingerprintCleanupThread.java
index c04830911d751933cf3dc2a35a828dedf8c47063..527dc34bc78f6db8946a0489d51cf77ebf9350de 100644
--- a/core/src/main/java/hudson/model/FingerprintCleanupThread.java
+++ b/core/src/main/java/hudson/model/FingerprintCleanupThread.java
@@ -29,7 +29,6 @@ import jenkins.model.Jenkins;
 import java.io.File;
 import java.io.FileFilter;
 import java.io.IOException;
-import java.util.logging.Level;
 import java.util.regex.Pattern;
 
 /**
@@ -72,7 +71,7 @@ public final class FingerprintCleanupThread extends AsyncPeriodicWork {
                 for(File file2 : files2) {
                     File[] files3 = file2.listFiles(FINGERPRINTFILE_FILTER);
                     for(File file3 : files3) {
-                        if(check(file3))
+                        if(check(file3, listener))
                             numFiles++;
                     }
                     deleteIfEmpty(file2);
@@ -81,7 +80,7 @@ public final class FingerprintCleanupThread extends AsyncPeriodicWork {
             }
         }
 
-        logger.log(Level.INFO, "Cleaned up "+numFiles+" records");
+        listener.getLogger().println("Cleaned up "+numFiles+" records");
     }
 
     /**
@@ -97,22 +96,22 @@ public final class FingerprintCleanupThread extends AsyncPeriodicWork {
     /**
      * Examines the file and returns true if a file was deleted.
      */
-    private boolean check(File fingerprintFile) {
+    private boolean check(File fingerprintFile, TaskListener listener) {
         try {
             Fingerprint fp = Fingerprint.load(fingerprintFile);
             if (fp == null || !fp.isAlive()) {
-                logger.fine("deleting obsolete " + fingerprintFile);
+                listener.getLogger().println("deleting obsolete " + fingerprintFile);
                 fingerprintFile.delete();
                 return true;
             } else {
                 // get the fingerprint in the official map so have the changes visible to Jenkins
                 // otherwise the mutation made in FingerprintMap can override our trimming.
-                logger.finer("possibly trimming " + fingerprintFile);
+                listener.getLogger().println("possibly trimming " + fingerprintFile);
                 fp = Jenkins.getInstance()._getFingerprint(fp.getHashString());
                 return fp.trim();
             }
         } catch (IOException e) {
-            logger.log(Level.WARNING, "Failed to process "+fingerprintFile, e);
+            e.printStackTrace(listener.error("Failed to process " + fingerprintFile));
             return false;
         }
     }
diff --git a/core/src/main/java/hudson/model/PeriodicWork.java b/core/src/main/java/hudson/model/PeriodicWork.java
index 1e43bf19ce481f6c02ebd135e57e308f6e4ec2c5..c3f593df2305b43dd53b0a600515ec83d5aececd 100644
--- a/core/src/main/java/hudson/model/PeriodicWork.java
+++ b/core/src/main/java/hudson/model/PeriodicWork.java
@@ -57,6 +57,9 @@ import static hudson.init.InitMilestone.JOB_LOADED;
  * @see AsyncPeriodicWork
  */
 public abstract class PeriodicWork extends SafeTimerTask implements ExtensionPoint {
+
+    /** @deprecated Use your own logger, or send messages to the logger in {@link AsyncPeriodicWork#execute}. */
+    @SuppressWarnings("NonConstantLogger")
     protected final Logger logger = Logger.getLogger(getClass().getName());
 
     /**