diff --git a/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/CliGuiceModule.java b/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/CliGuiceModule.java
index 65610a5842..89afa548ed 100644
--- a/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/CliGuiceModule.java
+++ b/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/CliGuiceModule.java
@@ -16,7 +16,6 @@
 
 package com.sun.identity.cli;
 
-import org.forgerock.http.Client;
 import org.forgerock.openam.entitlement.configuration.ResourceTypeConfiguration;
 import org.forgerock.openam.entitlement.configuration.ResourceTypeConfigurationImpl;
 import org.forgerock.openam.entitlement.constraints.ConstraintValidator;
@@ -30,7 +29,6 @@
 import org.forgerock.openam.entitlement.utils.NullNotificationBroker;
 import org.forgerock.openam.notifications.NotificationBroker;
 import org.forgerock.openam.session.SessionCache;
-import org.forgerock.openam.shared.guice.CloseableHttpClientProvider;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.assistedinject.FactoryModuleBuilder;
@@ -61,7 +59,5 @@ protected void configure() {
                 .build(EntitlementConfigurationFactory.class));
 
         bind(SessionCache.class).toInstance(SessionCache.getInstance());
-
-        bind(Client.class).toProvider(CloseableHttpClientProvider.class);
     }
 }
diff --git a/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/WebCliGuiceModule.java b/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/WebCliGuiceModule.java
deleted file mode 100644
index aec7ebf44f..0000000000
--- a/openam-cli/openam-cli-impl/src/main/java/com/sun/identity/cli/WebCliGuiceModule.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.sun.identity.cli;
-
-import org.forgerock.guice.core.GuiceModule;
-import org.forgerock.http.Client;
-import org.forgerock.openam.shared.guice.CloseableHttpClientProvider;
-
-import com.google.inject.Binder;
-import com.google.inject.Module;
-import com.google.inject.Scopes;
-
-@GuiceModule
-public class WebCliGuiceModule implements Module {
-
-	@Override
-	public void configure(Binder binder) {
-		binder.bind(Client.class).toProvider(CloseableHttpClientProvider.class).in(Scopes.SINGLETON);
-	}
-	
-}
diff --git a/openam-rest/src/main/resources/META-INF/services/com.google.inject.Module b/openam-rest/src/main/resources/META-INF/services/com.google.inject.Module
index a186dda58d..9d2cb2a762 100644
--- a/openam-rest/src/main/resources/META-INF/services/com.google.inject.Module
+++ b/openam-rest/src/main/resources/META-INF/services/com.google.inject.Module
@@ -20,4 +20,3 @@ org.forgerock.openam.core.guice.CoreGuiceModule
 org.forgerock.openam.core.guice.DataLayerGuiceModule
 org.forgerock.openam.audit.AuditCoreGuiceModule
 org.forgerock.openam.audit.configuration.AuditConfigurationGuiceModule
-com.sun.identity.cli.WebCliGuiceModule
diff --git a/openam-shared/src/main/java/org/forgerock/openam/shared/guice/SharedGuiceModule.java b/openam-shared/src/main/java/org/forgerock/openam/shared/guice/SharedGuiceModule.java
index 595479599d..8d388dbf36 100644
--- a/openam-shared/src/main/java/org/forgerock/openam/shared/guice/SharedGuiceModule.java
+++ b/openam-shared/src/main/java/org/forgerock/openam/shared/guice/SharedGuiceModule.java
@@ -20,6 +20,7 @@
 import javax.inject.Singleton;
 
 import org.forgerock.guice.core.GuiceModule;
+import org.forgerock.http.Client;
 import org.forgerock.openam.audit.context.AMExecutorServiceFactory;
 import org.forgerock.openam.audit.context.AuditRequestContextPropagatingExecutorServiceFactory;
 import org.forgerock.openam.shared.concurrency.ThreadMonitor;
@@ -29,6 +30,7 @@
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
+import com.google.inject.Scopes;
 import com.google.inject.name.Names;
 import com.sun.identity.shared.debug.Debug;
 
@@ -50,6 +52,7 @@ protected void configure() {
                 .toInstance(Debug.getInstance(DEBUG_THREAD_MANAGER));
         bind(ShutdownManager.class).toInstance(com.sun.identity.common.ShutdownManager.getInstance());
         bind(KeyPairProviderFactory.class).to(KeyPairProviderFactoryImpl.class);
+        bind(Client.class).toProvider(CloseableHttpClientProvider.class).in(Scopes.SINGLETON);
     }
 
     @Provides @Inject