3 files changed, 9 insertions, 7 deletions

diff --git a/src/wixext/Tuples/SecureObjectsTuple.cs b/src/wixext/Tuples/SecureObjectsTuple.cs
index 920fe7b3..dd658be1 100644
--- a/src/wixext/Tuples/SecureObjectsTuple.cs
+++ b/src/wixext/Tuples/SecureObjectsTuple.cs
@@ -11,6 +11,7 @@ namespace WixToolset.Util
             UtilTupleDefinitionType.SecureObjects.ToString(),
             new[]
             {
+                new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.SecureObject), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.Table), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.Domain), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.User), IntermediateFieldType.String),
@@ -27,6 +28,7 @@ namespace WixToolset.Util.Tuples
 
     public enum SecureObjectsTupleFields
     {
+        SecureObject,
         Table,
         Domain,
         User,
@@ -46,6 +48,12 @@ namespace WixToolset.Util.Tuples
 
         public IntermediateField this[SecureObjectsTupleFields index] => this.Fields[(int)index];
 
+        public string SecureObject
+        {
+            get => this.Fields[(int)SecureObjectsTupleFields.SecureObject].AsString();
+            set => this.Set((int)SecureObjectsTupleFields.SecureObject, value);
+        }
+
         public string Table
         {
             get => this.Fields[(int)SecureObjectsTupleFields.Table].AsString();
diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs
index 6e3c2531..fef9175e 100644
--- a/src/wixext/UtilCompiler.cs
+++ b/src/wixext/UtilCompiler.cs
@@ -2481,6 +2481,7 @@ namespace WixToolset.Util
                 var id = this.ParseHelper.CreateIdentifier("sec", objectId, tableName, domain, user);
                 var tuple = new SecureObjectsTuple(sourceLineNumbers, id)
                 {
+                    SecureObject = objectId,
                     Table = tableName,
                     Domain = domain,
                     User = user,
diff --git a/src/wixext/UtilWindowsInstallerBackendExtension.cs b/src/wixext/UtilWindowsInstallerBackendExtension.cs
index 8648cb17..2365ed01 100644
--- a/src/wixext/UtilWindowsInstallerBackendExtension.cs
+++ b/src/wixext/UtilWindowsInstallerBackendExtension.cs
@@ -5,7 +5,6 @@ namespace WixToolset.Util
     using System.Collections.Generic;
     using System.Linq;
     using System.Xml;
-    using WixToolset.Data;
     using WixToolset.Data.WindowsInstaller;
     using WixToolset.Extensibility;
 
@@ -15,12 +14,6 @@ namespace WixToolset.Util
 
         public override IEnumerable<TableDefinition> TableDefinitions { get => Tables; }
 
-        public override bool TryAddTupleToOutput(IntermediateTuple tuple, WindowsInstallerData output)
-        {
-            var columnZeroIsId = tuple.Id != null;
-            return this.BackendHelper.TryAddTupleToOutputMatchingTableDefinitions(tuple, output, this.TableDefinitions, columnZeroIsId);
-        }
-
         private static TableDefinition[] LoadTables()
         {
             using (var resourceStream = typeof(UtilWindowsInstallerBackendBinderExtension).Assembly.GetManifestResourceStream("WixToolset.Util.tables.xml"))