diff --git a/briar-core/src/main/java/org/briarproject/briar/BriarCoreEagerSingletons.java b/briar-core/src/main/java/org/briarproject/briar/BriarCoreEagerSingletons.java
index 163e68534..a3c1d52db 100644
--- a/briar-core/src/main/java/org/briarproject/briar/BriarCoreEagerSingletons.java
+++ b/briar-core/src/main/java/org/briarproject/briar/BriarCoreEagerSingletons.java
@@ -10,7 +10,7 @@ import org.briarproject.briar.messaging.MessagingModule;
 import org.briarproject.briar.privategroup.PrivateGroupModule;
 import org.briarproject.briar.privategroup.invitation.GroupInvitationModule;
 import org.briarproject.briar.sharing.SharingModule;
-import org.briarproject.briar.socialbackup.SocialBackupModule;
+//import org.briarproject.briar.socialbackup.DefaultSocialBackupModule;
 
 public interface BriarCoreEagerSingletons {
 
@@ -34,7 +34,7 @@ public interface BriarCoreEagerSingletons {
 
 	void inject(SharingModule.EagerSingletons init);
 
-	void inject(SocialBackupModule.EagerSingletons init);
+//	void inject(DefaultSocialBackupModule.EagerSingletons init);
 
 	class Helper {
 
@@ -49,7 +49,7 @@ public interface BriarCoreEagerSingletons {
 			c.inject(new SharingModule.EagerSingletons());
 			c.inject(new IdentityModule.EagerSingletons());
 			c.inject(new IntroductionModule.EagerSingletons());
-			c.inject(new SocialBackupModule.EagerSingletons());
+//			c.inject(new DefaultSocialBackupModule.EagerSingletons());
 		}
 	}
 }
diff --git a/briar-core/src/main/java/org/briarproject/briar/BriarCoreModule.java b/briar-core/src/main/java/org/briarproject/briar/BriarCoreModule.java
index 2144fa654..b35c5ce79 100644
--- a/briar-core/src/main/java/org/briarproject/briar/BriarCoreModule.java
+++ b/briar-core/src/main/java/org/briarproject/briar/BriarCoreModule.java
@@ -13,7 +13,7 @@ import org.briarproject.briar.messaging.MessagingModule;
 import org.briarproject.briar.privategroup.PrivateGroupModule;
 import org.briarproject.briar.privategroup.invitation.GroupInvitationModule;
 import org.briarproject.briar.sharing.SharingModule;
-import org.briarproject.briar.socialbackup.SocialBackupModule;
+import org.briarproject.briar.socialbackup.DefaultSocialBackupModule;
 import org.briarproject.briar.test.TestModule;
 
 import dagger.Module;
@@ -32,7 +32,6 @@ import dagger.Module;
 		MessagingModule.class,
 		PrivateGroupModule.class,
 		SharingModule.class,
-		SocialBackupModule.class,
 		TestModule.class
 })
 public class BriarCoreModule {
diff --git a/briar-core/src/main/java/org/briarproject/briar/socialbackup/DefaultSocialBackupModule.java b/briar-core/src/main/java/org/briarproject/briar/socialbackup/DefaultSocialBackupModule.java
index cefa9d6e2..c42545fe8 100644
--- a/briar-core/src/main/java/org/briarproject/briar/socialbackup/DefaultSocialBackupModule.java
+++ b/briar-core/src/main/java/org/briarproject/briar/socialbackup/DefaultSocialBackupModule.java
@@ -91,7 +91,6 @@ public class DefaultSocialBackupModule {
 
 	@Provides
 	DarkCrystal darkCrystal(DarkCrystalStub darkCrystal) {
-		// TODO: Replace this with a real implementation
 		return darkCrystal;
 	}
 }
diff --git a/briar-core/src/test/java/org/briarproject/briar/socialbackup/SocialBackupIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/socialbackup/SocialBackupIntegrationTest.java
index 0ba50fcd2..ab08030b5 100644
--- a/briar-core/src/test/java/org/briarproject/briar/socialbackup/SocialBackupIntegrationTest.java
+++ b/briar-core/src/test/java/org/briarproject/briar/socialbackup/SocialBackupIntegrationTest.java
@@ -12,6 +12,8 @@ import org.junit.Test;
 
 import java.util.List;
 
+import dagger.Provides;
+
 import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
diff --git a/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTestComponent.java b/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTestComponent.java
index 6092cd47f..9feb53187 100644
--- a/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTestComponent.java
+++ b/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTestComponent.java
@@ -37,7 +37,7 @@ import org.briarproject.briar.messaging.MessagingModule;
 import org.briarproject.briar.privategroup.PrivateGroupModule;
 import org.briarproject.briar.privategroup.invitation.GroupInvitationModule;
 import org.briarproject.briar.sharing.SharingModule;
-import org.briarproject.briar.socialbackup.SocialBackupModule;
+import org.briarproject.briar.socialbackup.DefaultSocialBackupModule;
 
 import javax.inject.Singleton;
 
@@ -72,7 +72,7 @@ public interface BriarIntegrationTestComponent
 
 	void inject(SharingModule.EagerSingletons init);
 
-	void inject(SocialBackupModule.EagerSingletons init);
+	void inject(DefaultSocialBackupModule.EagerSingletons init);
 
 	LifecycleManager getLifecycleManager();
 
@@ -137,7 +137,7 @@ public interface BriarIntegrationTestComponent
 			c.inject(new MessagingModule.EagerSingletons());
 			c.inject(new PrivateGroupModule.EagerSingletons());
 			c.inject(new SharingModule.EagerSingletons());
-			c.inject(new SocialBackupModule.EagerSingletons());
+			c.inject(new DefaultSocialBackupModule.EagerSingletons());
 		}
 	}
 }