2 files changed, 2 insertions, 2 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs
index fb4b4ee3..1f43a025 100644
--- a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs
@@ -30,7 +30,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
             this.SuppressDemodularization = suppressDemodularization;
             this.SkipSummaryInfo = skipSummaryInfo;
 
-            this.TableDefinitions = WindowsInstallerStandardInternal.GetTableDefinitions();
+            this.TableDefinitions = new TableDefinitionCollection(WindowsInstallerTableDefinitions.All);
         }
 
         public IMessaging Messaging { get; }
diff --git a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindTranformCommand.cs b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindTranformCommand.cs
index 9261fda0..de2c5e37 100644
--- a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindTranformCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindTranformCommand.cs
@@ -24,7 +24,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
             this.ExportBasePath = exportBasePath;
             this.IntermediateFolder = intermediateFolder;
 
-            this.TableDefinitions = WindowsInstallerStandardInternal.GetTableDefinitions();
+            this.TableDefinitions = new TableDefinitionCollection(WindowsInstallerTableDefinitions.All);
         }
 
         private IMessaging Messaging { get; }