diff -r a082c848c9a9 -r 3cdbd92ee07b fotaapplication/fotaserver/FotaServer/src/FotaServer.cpp
--- a/fotaapplication/fotaserver/FotaServer/src/FotaServer.cpp	Wed Sep 15 13:08:27 2010 +0300
+++ b/fotaapplication/fotaserver/FotaServer/src/FotaServer.cpp	Wed Oct 13 15:30:06 2010 +0300
@@ -31,7 +31,6 @@
 #include <nsmlconstants.h>
 #include <centralrepository.h>
 #include <sysversioninfo.h>
-#include <featdiscovery.h>
 #include "FotaSrvApp.h"
 #include "FotaServer.h"
 #include "FotaSrvDebug.h"
@@ -2416,14 +2415,6 @@
             __LEAVE_IF_ERROR(err);
             }
         }
-    
-    if(!IsFOTANeedToDecryptL())
-       {
-       iDEController->CheckIfDeviceMemoryBusyL();
-       return EFalse;
-       }
-    
-        
     TRAPD(err, ret = iDEController->NeedToDecryptL(drive));
     
     delete iDEController; iDEController = NULL;
@@ -2599,21 +2590,3 @@
     return ret;
     }
 
-// --------------------------------------------------------------------------
-// CFotaServer::IsFOTANeedToDecryptL
-// This method returns the device encryption operation.
-// 
-// --------------------------------------------------------------------------
-// 
-TBool CFotaServer::IsFOTANeedToDecryptL()
-    {
-    FLOG(_L("CFotaServer::IsFOTANeedToDecryptL >>"));
-
-    TBool ret(EFalse);
-    ret = CFeatureDiscovery::IsFeatureSupportedL(TUid::Uid(KFeatureIdFfFotaDecryptMemBeforeUpdate));
-    
-    FLOG(_L("CFotaServer::IsFOTANeedToDecryptL, ret = %d <<"), ret);
-    return ret;
-    }
-
-