diff --git a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/AMQPSession.java b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/AMQPSession.java
index ab45387..b2f1f10 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/AMQPSession.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/AMQPSession.java
@@ -2,7 +2,6 @@
 
 import com.google.gerrit.extensions.annotations.PluginName;
 import com.google.inject.Inject;
-import com.google.inject.Singleton;
 
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
@@ -15,7 +14,6 @@
 
 import java.util.UUID;
 
-@Singleton
 public class AMQPSession {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(AMQPSession.class);
@@ -27,10 +25,6 @@
   private Channel publishChannel;
   private String exchangeName;
 
-  interface Factory {
-    public AMQPSession create();
-  }
-
   @Inject
   public AMQPSession(@PluginName String pluginName, Properties properties) {
     this.properties = properties;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/Module.java b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/Module.java
index 669af1f..e081ca1 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/Module.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/Module.java
@@ -24,9 +24,9 @@
   @Override
   protected void configure() {
     bind(AMQPSession.class);
+    bind(Properties.class);
     bind(ConnectionMonitorTask.class);
     DynamicSet.bind(binder(), ChangeListener.class).to(RabbitMQManager.class);
     DynamicSet.bind(binder(), LifecycleListener.class).to(RabbitMQManager.class);
-    install(new FactoryModuleBuilder().build(AMQPSession.Factory.class));
   }
 }