diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementCrypto.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementCrypto.java
index fc9b8a575..888e33d6e 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementCrypto.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementCrypto.java
@@ -14,8 +14,8 @@ interface TransportKeyAgreementCrypto {
 
 	KeyPair generateKeyPair();
 
-	SecretKey deriveRootKey(KeyPair localKeyPair, PublicKey remotePublicKey,
-			long timestamp) throws GeneralSecurityException;
+	SecretKey deriveRootKey(KeyPair localKeyPair, PublicKey remotePublicKey)
+			throws GeneralSecurityException;
 
 	PublicKey parsePublicKey(byte[] encoded) throws FormatException;
 
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementCryptoImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementCryptoImpl.java
index 5ae01dccc..5fed461e1 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementCryptoImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementCryptoImpl.java
@@ -34,8 +34,7 @@ class TransportKeyAgreementCryptoImpl implements TransportKeyAgreementCrypto {
 
 	@Override
 	public SecretKey deriveRootKey(KeyPair localKeyPair,
-			PublicKey remotePublicKey, long timestamp)
-			throws GeneralSecurityException {
+			PublicKey remotePublicKey) throws GeneralSecurityException {
 		byte[] theirPublic = remotePublicKey.getEncoded();
 		byte[] ourPublic = localKeyPair.getPublic().getEncoded();
 		boolean alice = compare(ourPublic, theirPublic) < 0;
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementManagerImpl.java
index 7bd479396..4c52526f2 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementManagerImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementManagerImpl.java
@@ -255,8 +255,7 @@ class TransportKeyAgreementManagerImpl extends BdfIncomingMessageHook
 		long minTimestamp = min(keyMessage.getTimestamp(), m.getTimestamp());
 		SecretKey rootKey;
 		try {
-			rootKey = crypto.deriveRootKey(localKeyPair, remotePublicKey,
-					minTimestamp);
+			rootKey = crypto.deriveRootKey(localKeyPair, remotePublicKey);
 		} catch (GeneralSecurityException e) {
 			return REJECT; // Invalid public key
 		}
@@ -281,8 +280,7 @@ class TransportKeyAgreementManagerImpl extends BdfIncomingMessageHook
 		long minTimestamp = min(localTimestamp, m.getTimestamp());
 		SecretKey rootKey;
 		try {
-			rootKey = crypto.deriveRootKey(localKeyPair, remotePublicKey,
-					minTimestamp);
+			rootKey = crypto.deriveRootKey(localKeyPair, remotePublicKey);
 		} catch (GeneralSecurityException e) {
 			return REJECT; // Invalid public key
 		}
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementManagerImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementManagerImplTest.java
index e2f786780..e05f70d41 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementManagerImplTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementManagerImplTest.java
@@ -530,8 +530,7 @@ public class TransportKeyAgreementManagerImplTest extends BrambleMockTestCase {
 	private void expectDeriveAndStoreTransportKeys(Transaction txn)
 			throws Exception {
 		context.checking(new Expectations() {{
-			oneOf(crypto).deriveRootKey(localKeyPair, remotePublicKey,
-					min(localTimestamp, remoteTimestamp));
+			oneOf(crypto).deriveRootKey(localKeyPair, remotePublicKey);
 			will(returnValue(rootKey));
 			oneOf(db).getContact(txn, contact.getId());
 			will(returnValue(contact));