--- a/installationservices/swi/source/securitymanager/certchainconstraints.cpp	Fri Feb 19 22:57:02 2010 +0200
+++ b/installationservices/swi/source/securitymanager/certchainconstraints.cpp	Fri Mar 12 15:43:14 2010 +0200
@@ -26,7 +26,6 @@
 #include "certchainconstraints.h"
 #include "x509constraintext.h"
 #include <x509certext.h>
-#include <collate.h> 
 //#include "log.h"
 
 using namespace Swi;
@@ -88,21 +87,17 @@
 	{
 	return iValidCapabilities.HasCapabilities(aRequestCapabilities);
 	}
-
+	
 EXPORT_C TBool CCertChainConstraints::DeviceIDIsValid(const HBufC* aRequestDeviceID) const
 	{
 	TBool ret=EFalse;
 	if (iDeviceIDsAreConstrained)
 		{
 		TInt deviceIDCount=iValidDeviceIDs.Count();
-
-		TCollationMethod m = *Mem::CollationMethodByIndex(0); // get the standard method
-		m.iFlags |= TCollationMethod::EFoldCase; // Convert to lowercase and compare.
-
 		//Check if request Device ID is in the valid device ID list
 		for(TInt i=0; i<deviceIDCount; i++)
 			{
-			if (iValidDeviceIDs[i]->CompareC(*aRequestDeviceID, 0, &m) ==0)
+			if (iValidDeviceIDs[i]->CompareF(*aRequestDeviceID)==0)
 				{
 				ret=ETrue;
 				break;