1 files changed, 5 insertions, 2 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/UnbindContext.cs b/src/WixToolset.Core.WindowsInstaller/UnbindContext.cs
index ed55f312..ff71bea4 100644
--- a/src/WixToolset.Core.WindowsInstaller/UnbindContext.cs
+++ b/src/WixToolset.Core.WindowsInstaller/UnbindContext.cs
@@ -2,12 +2,15 @@
 
 namespace WixToolset.Core
 {
-    using WixToolset.Data;
+    using System;
     using WixToolset.Extensibility;
+    using WixToolset.Extensibility.Services;
 
     internal class UnbindContext : IUnbindContext
     {
-        public Messaging Messaging { get; } = Messaging.Instance;
+        public IServiceProvider ServiceProvider { get; }
+
+        public IMessaging Messaging { get; set; }
 
         public string ExportBasePath { get; set; }