diff --git a/mythtv/programs/mythbackend/mainserver.cpp b/mythtv/programs/mythbackend/mainserver.cpp
index 802232c..6fecbfd 100644
--- a/mythtv/programs/mythbackend/mainserver.cpp
+++ b/mythtv/programs/mythbackend/mainserver.cpp
@@ -941,7 +941,7 @@ void MainServer::customEvent(QEvent *e)
                 {
                     recInfo.ForgetHistory();
                 }
-                DoHandleDeleteRecording(recInfo, NULL, false, true, false);
+                DoHandleDeleteRecording(recInfo, NULL, false, false);
             }
             else
             {
@@ -989,9 +989,9 @@ void MainServer::customEvent(QEvent *e)
             if (recInfo.GetChanID())
             {
                 if (tokens[0] == "FORCE_DELETE_RECORDING")
-                    DoHandleDeleteRecording(recInfo, NULL, true, false, false);
+                    DoHandleDeleteRecording(recInfo, NULL, true, false);
                 else
-                    DoHandleDeleteRecording(recInfo, NULL, false, false, false);
+                    DoHandleDeleteRecording(recInfo, NULL, false, false);
             }
             else
             {
@@ -2444,7 +2444,7 @@ void MainServer::HandleDeleteRecording(QString &chanid, QString &starttime,
         return;
     }
 
-    DoHandleDeleteRecording(recinfo, pbs, forceMetadataDelete, false, forgetHistory);
+    DoHandleDeleteRecording(recinfo, pbs, forceMetadataDelete, forgetHistory);
 }
 
 void MainServer::HandleDeleteRecording(QStringList &slist, PlaybackSock *pbs,
@@ -2453,23 +2453,20 @@ void MainServer::HandleDeleteRecording(QStringList &slist, PlaybackSock *pbs,
     QStringList::const_iterator it = slist.begin() + 1;
     RecordingInfo recinfo(it, slist.end());
     if (recinfo.GetChanID())
-        DoHandleDeleteRecording(recinfo, pbs, forceMetadataDelete, false, false);
+        DoHandleDeleteRecording(recinfo, pbs, forceMetadataDelete, false);
 }
 
 void MainServer::DoHandleDeleteRecording(
     RecordingInfo &recinfo, PlaybackSock *pbs,
-    bool forceMetadataDelete, bool expirer, bool forgetHistory)
+    bool forceMetadataDelete, bool forgetHistory)
 {
     int resultCode = -1;
     MythSocket *pbssock = NULL;
     if (pbs)
         pbssock = pbs->getSocket();
 
-    bool justexpire = expirer ? false :
-            ( //gCoreContext->GetNumSetting("AutoExpireInsteadOfDelete") &&
-             (recinfo.GetRecordingGroup() != "Deleted") &&
+    bool justexpire = ((recinfo.GetRecordingGroup() != "Deleted") &&
              (recinfo.GetRecordingGroup() != "LiveTV"));
-
     QString filename = GetPlaybackURL(&recinfo, false);
     if (filename.isEmpty())
     {
diff --git a/mythtv/programs/mythbackend/mainserver.h b/mythtv/programs/mythbackend/mainserver.h
index e27c9ae..5ed4775 100644
--- a/mythtv/programs/mythbackend/mainserver.h
+++ b/mythtv/programs/mythbackend/mainserver.h
@@ -158,8 +158,8 @@ class MainServer : public QObject, public MythSocketCBs
     void HandleDeleteRecording(QStringList &slist, PlaybackSock *pbs,
                                bool forceMetadataDelete);
     void DoHandleDeleteRecording(RecordingInfo &recinfo, PlaybackSock *pbs,
-                                 bool forceMetadataDelete, bool expirer=false,
-                                 bool forgetHistory=false);
+                                 bool forceMetadataDelete,
+				 bool forgetHistory=false);
     void HandleUndeleteRecording(QStringList &slist, PlaybackSock *pbs);
     void DoHandleUndeleteRecording(RecordingInfo &recinfo, PlaybackSock *pbs);
     void HandleForgetRecording(QStringList &slist, PlaybackSock *pbs);