--- a/cryptoservices/filebasedcertificateandkeystores/source/generic/server/fsserver.cpp	Tue Aug 31 17:00:08 2010 +0300
+++ b/cryptoservices/filebasedcertificateandkeystores/source/generic/server/fsserver.cpp	Wed Sep 01 12:40:57 2010 +0100
@@ -132,13 +132,6 @@
 	FSDialog::InitialiseL();
 	
 	TPtrC serverName(KFSTokenServerName());
-		// Naming the server thread after the server helps to debug panics
-#ifdef __WINS__
-#ifdef SYMBIAN_KEYSTORE_USE_AUTH_SERVER
-	serverName.Set(KFSNewTokenServerName());
-#endif // SYMBIAN_KEYSTORE_USE_AUTH_SERVER
-#endif // __WINS__
-		
 	StartL(serverName);
 	
 	// Ensure that the server still exits even if the 1st client fails to connect
@@ -264,12 +257,7 @@
 static void RunServerL()
 	{
 	TPtrC serverName(KFSTokenServerName());
-	// Naming the server thread after the server helps to debug panics
-#ifdef __WINS__
-#ifdef SYMBIAN_KEYSTORE_USE_AUTH_SERVER
-	serverName.Set(KFSNewTokenServerName());
-#endif // SYMBIAN_KEYSTORE_USE_AUTH_SERVER
-#endif // __WINS__
+
 	
 	User::LeaveIfError(User::RenameThread(serverName));