Since this is effectively a bug in the `NServiceBus.Hosting.Windows` I would prefer that the change be isolated to that project. The reason being this change only serves to enable `NServiceBus.Hosting.Windows` in fixing the bug.  If you move this code into a class inside `NServiceBus.Hosting.Windows`  will merge this PR.