2 files changed, 10 insertions, 1 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Unbinder.cs b/src/WixToolset.Core.WindowsInstaller/Unbinder.cs
index a2f02269..99caaba9 100644
--- a/src/WixToolset.Core.WindowsInstaller/Unbinder.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Unbinder.cs
@@ -11,8 +11,16 @@ namespace WixToolset.Core
     /// <summary>
     /// Unbinder core of the WiX toolset.
     /// </summary>
-    internal sealed class Unbinder
+    internal sealed class Unbinder : IUnbinder
     {
+        public Unbinder(IWixToolsetServiceProvider serviceProvider)
+        {
+            this.ServiceProvider = serviceProvider;
+
+            var extensionManager = this.ServiceProvider.GetService<IExtensionManager>();
+            this.BackendFactories = extensionManager.GetServices<IBackendFactory>();
+        }
+
         public IEnumerable<IBackendFactory> BackendFactories { get; }
 
         /// <summary>
diff --git a/src/WixToolset.Core.WindowsInstaller/WixToolsetCoreServiceProviderExtensions.cs b/src/WixToolset.Core.WindowsInstaller/WixToolsetCoreServiceProviderExtensions.cs
index c69f1af1..e013cefb 100644
--- a/src/WixToolset.Core.WindowsInstaller/WixToolsetCoreServiceProviderExtensions.cs
+++ b/src/WixToolset.Core.WindowsInstaller/WixToolsetCoreServiceProviderExtensions.cs
@@ -31,6 +31,7 @@ namespace WixToolset.Core.WindowsInstaller
         {
             // Singletons.
             coreProvider.AddService((provider, singletons) => AddSingleton<IWindowsInstallerBackendHelper>(singletons, new WindowsInstallerBackendHelper()));
+            coreProvider.AddService<IUnbinder>((provider, singletons) => new Unbinder(provider));
         }
 
         private static T AddSingleton<T>(Dictionary<Type, object> singletons, T service) where T : class