The previous changes somehow regressed on olive samples, so give quick fixes.

mcs/class/System.ServiceModel/System.ServiceModel.Channels.Security/SecureMessageGenerator.cs

@@ -311,6 +311,10 @@ namespace System.ServiceModel.Channels.Security
 			if (secprop.EncryptionKey != null)
 				actualKey.Key = secprop.EncryptionKey;
 
+// FIXME: remove thid hack
+if (!ShouldOutputEncryptedKey)
+primaryToken = secprop.ProtectionToken.SecurityToken as WrappedKeySecurityToken;
+else
 			primaryToken =
 				// FIXME: remove this hack?
 				encToken is SecurityContextSecurityToken ? encToken :

mcs/class/System.ServiceModel/System.ServiceModel.Channels/SecurityBindingElement.cs

@@ -182,6 +182,10 @@ namespace System.ServiceModel.Channels
 		[MonoTODO ("Implement for TransportSecurityBindingElement")]
 		public override bool CanBuildChannelListener<TChannel> (BindingContext context)
 		{
+			// FIXME: enable implementation below (it somehow regressed, needs investigation)
+			return context.CanBuildInnerChannelListener<TChannel> ();
+
+/*
 			if (this is TransportSecurityBindingElement)
 				throw new NotImplementedException ();
 
@@ -211,6 +215,7 @@ namespace System.ServiceModel.Channels
 						context.CanBuildInnerChannelFactory<IDuplexSessionChannel> ();
 			}
 			return false;
+*/
 		}
 
 		public override IChannelListener<TChannel> BuildChannelListener<TChannel> (