diff --git a/components/net/sf/briar/db/DatabaseModule.java b/components/net/sf/briar/db/DatabaseModule.java
index 36a63cd63087dc016d150327d1933258fc1ffb52..19abe69a7cf12a1c71cdc3b8930aad3cc6b48047 100644
--- a/components/net/sf/briar/db/DatabaseModule.java
+++ b/components/net/sf/briar/db/DatabaseModule.java
@@ -25,8 +25,8 @@ public class DatabaseModule extends AbstractModule {
 	@Override
 	protected void configure() {
 		bind(DatabaseCleaner.class).to(DatabaseCleanerImpl.class);
-		bind(Executor.class).annotatedWith(DatabaseExecutor.class).to(
-				DatabaseExecutorImpl.class).in(Singleton.class);
+		bind(Executor.class).annotatedWith(DatabaseExecutor.class).toInstance(
+				new DatabaseExecutorImpl());
 	}
 
 	@Provides
diff --git a/components/net/sf/briar/protocol/ProtocolModule.java b/components/net/sf/briar/protocol/ProtocolModule.java
index b85e75d5351b04ee232da857dc7bddef4e1e456c..921d30cd4709755522235617cbb8322d1a88efdb 100644
--- a/components/net/sf/briar/protocol/ProtocolModule.java
+++ b/components/net/sf/briar/protocol/ProtocolModule.java
@@ -22,7 +22,6 @@ import net.sf.briar.api.serial.ObjectReader;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
-import com.google.inject.Singleton;
 
 public class ProtocolModule extends AbstractModule {
 
@@ -35,8 +34,9 @@ public class ProtocolModule extends AbstractModule {
 		bind(ProtocolReaderFactory.class).to(ProtocolReaderFactoryImpl.class);
 		bind(ProtocolWriterFactory.class).to(ProtocolWriterFactoryImpl.class);
 		bind(UnverifiedBatchFactory.class).to(UnverifiedBatchFactoryImpl.class);
-		bind(Executor.class).annotatedWith(VerificationExecutor.class).to(
-				VerificationExecutorImpl.class).in(Singleton.class);
+		bind(Executor.class).annotatedWith(
+				VerificationExecutor.class).toInstance(
+						new VerificationExecutorImpl());
 	}
 
 	@Provides