diff --git a/src/main/java/hudson/matrix/LinkedLogRotator.java b/src/main/java/hudson/matrix/LinkedLogRotator.java
deleted file mode 100644
index b33fe6ef..00000000
--- a/src/main/java/hudson/matrix/LinkedLogRotator.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * The MIT License
- * 
- * Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package hudson.matrix;
-
-import hudson.model.Job;
-import hudson.tasks.LogRotator;
-import hudson.util.RunList;
-
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * {@link LogRotator} for {@link MatrixConfiguration},
- * which discards the builds if and only if it's discarded
- * in the parent.
- *
- * <p>
- * Because of the serialization compatibility, we can't easily
- * refactor {@link LogRotator} into a contract and an implementation. 
- *
- * @author Kohsuke Kawaguchi
- */
-final class LinkedLogRotator extends LogRotator {
-    LinkedLogRotator(int artifactDaysToKeep, int artifactNumToKeep) {
-        super(-1, -1, artifactDaysToKeep, artifactNumToKeep);
-    }
-
-    /**
-     * @deprecated since 1.369
-     *     Use {@link #LinkedLogRotator(int, int)}
-     */
-    LinkedLogRotator() {
-        super(-1, -1, -1, -1);
-    }
-
-    @Override
-    public void perform(Job _job) throws IOException, InterruptedException {
-        // Let superclass handle clearing artifacts, if configured:
-        super.perform(_job);
-        if (!(_job instanceof MatrixConfiguration)) {
-            LOGGER.log(Level.SEVERE, "Log rotator got a job with a wrong type. {0} of {1}", 
-                    new Object[] {_job.getFullName(), _job.getClass()});
-        }
-        MatrixConfiguration job = (MatrixConfiguration) _job;
-
-        // copy it to the array because we'll be deleting builds as we go.
-        for( MatrixRun r : job.getBuilds() ) {
-            if(job.getParent().getBuildByNumber(r.getNumber())==null) {
-                LOGGER.log(Level.FINE, "Deleting {0}", r.getFullDisplayName());
-                r.delete();
-            }
-        }
-
-        if(!job.isActiveConfiguration() && job.getLastBuild()==null) {
-            LOGGER.log(Level.FINE, "Deleting {0} because the configuration is inactive and there''s no builds", job.getFullDisplayName());
-            job.delete();
-        }
-    }
-
-    private static final Logger LOGGER = Logger.getLogger(LinkedLogRotator.class.getName());
-}
diff --git a/src/main/java/hudson/matrix/MatrixConfiguration.java b/src/main/java/hudson/matrix/MatrixConfiguration.java
index ccd792bf..c18b2959 100644
--- a/src/main/java/hudson/matrix/MatrixConfiguration.java
+++ b/src/main/java/hudson/matrix/MatrixConfiguration.java
@@ -401,17 +401,6 @@ public Publisher getPublisher(Descriptor<Publisher> descriptor) {
         return getParent().getPublisher(descriptor);
     }
 
-    @Override
-    public BuildDiscarder getBuildDiscarder() {
-        // TODO: LinkedLogRotator doesn't work very well in the face of pluggable BuildDiscarder but I don't know what to do
-        BuildDiscarder bd = getParent().getBuildDiscarder();
-        if (bd instanceof LogRotator) {
-            LogRotator lr = (LogRotator) bd;
-            return new LinkedLogRotator(lr.getArtifactDaysToKeep(),lr.getArtifactNumToKeep());
-        }
-        return new LinkedLogRotator();
-    }
-
     @Override
     public SCM getScm() {
         return getParent().getScm();