diff --git a/core/src/main/java/hudson/os/windows/ManagedWindowsServiceConnector.java b/core/src/main/java/hudson/os/windows/ManagedWindowsServiceConnector.java
index 1bbf7be6932db2d5aa93da06430fb7820d6598a1..163d34d4a5928d24f52f16a8d5d6554bd6c3bd8c 100644
--- a/core/src/main/java/hudson/os/windows/ManagedWindowsServiceConnector.java
+++ b/core/src/main/java/hudson/os/windows/ManagedWindowsServiceConnector.java
@@ -33,22 +33,10 @@ public class ManagedWindowsServiceConnector extends ComputerConnector {
 
     @Override
     public ManagedWindowsServiceLauncher launch(final String hostName, TaskListener listener) throws IOException, InterruptedException {
-        return new ManagedWindowsServiceLauncher(userName,Secret.toString(password)) {
-            @Override
-            protected String determineHost(Computer c) throws IOException, InterruptedException {
-                return hostName;
-            }
-
-            @Override
-            public Descriptor<ComputerLauncher> getDescriptor() {
-                return Jenkins.getInstance().getDescriptor(ManagedWindowsServiceLauncher.class);
-            }
-        };
+        return new ManagedWindowsServiceLauncher(userName,Secret.toString(password),hostName);
     }
 
     @Extension
-//  Fix broken trunk (temporary)
-//  public static class DescriptorImpl extends Descriptor<ComputerLauncher> {
     public static class DescriptorImpl extends ComputerConnectorDescriptor {
         public String getDisplayName() {
             return Messages.ManagedWindowsServiceLauncher_DisplayName();