diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/system/Clock.java b/bramble-api/src/main/java/org/briarproject/bramble/api/system/Clock.java
index a2b4fef41..2b55c4196 100644
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/system/Clock.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/system/Clock.java
@@ -11,11 +11,6 @@ public interface Clock {
 	 */
 	long currentTimeMillis();
 
-	/**
-	 * @see System#nanoTime()
-	 */
-	long nanoTime();
-
 	/**
 	 * @see Thread#sleep(long)
 	 */
diff --git a/bramble-api/src/test/java/org/briarproject/bramble/test/ArrayClock.java b/bramble-api/src/test/java/org/briarproject/bramble/test/ArrayClock.java
index 6b108bd82..fc7c40e68 100644
--- a/bramble-api/src/test/java/org/briarproject/bramble/test/ArrayClock.java
+++ b/bramble-api/src/test/java/org/briarproject/bramble/test/ArrayClock.java
@@ -16,11 +16,6 @@ public class ArrayClock implements Clock {
 		return times[index++];
 	}
 
-	@Override
-	public long nanoTime() {
-		return times[index++] * 1_000_000;
-	}
-
 	@Override
 	public void sleep(long milliseconds) throws InterruptedException {
 		Thread.sleep(milliseconds);
diff --git a/bramble-api/src/test/java/org/briarproject/bramble/test/SettableClock.java b/bramble-api/src/test/java/org/briarproject/bramble/test/SettableClock.java
index 692465e41..26f885de8 100644
--- a/bramble-api/src/test/java/org/briarproject/bramble/test/SettableClock.java
+++ b/bramble-api/src/test/java/org/briarproject/bramble/test/SettableClock.java
@@ -17,11 +17,6 @@ public class SettableClock implements Clock {
 		return time.get();
 	}
 
-	@Override
-	public long nanoTime() {
-		return time.get() * 1_000_000;
-	}
-
 	@Override
 	public void sleep(long milliseconds) throws InterruptedException {
 		Thread.sleep(milliseconds);
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/io/TimeoutInputStream.java b/bramble-core/src/main/java/org/briarproject/bramble/io/TimeoutInputStream.java
index 4c5a2ce21..1a433254f 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/io/TimeoutInputStream.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/io/TimeoutInputStream.java
@@ -13,28 +13,28 @@ class TimeoutInputStream extends InputStream {
 
 	private final Clock clock;
 	private final InputStream in;
-	private final long timeoutNs;
+	private final long timeoutMs;
 	private final CloseListener listener;
 	private final Object lock = new Object();
 	@GuardedBy("lock")
-	private long readStartedNs = -1;
+	private long readStartedMs = -1;
 
-	TimeoutInputStream(Clock clock, InputStream in, long timeoutNs,
+	TimeoutInputStream(Clock clock, InputStream in, long timeoutMs,
 			CloseListener listener) {
 		this.clock = clock;
 		this.in = in;
-		this.timeoutNs = timeoutNs;
+		this.timeoutMs = timeoutMs;
 		this.listener = listener;
 	}
 
 	@Override
 	public int read() throws IOException {
 		synchronized (lock) {
-			readStartedNs = clock.nanoTime();
+			readStartedMs = clock.currentTimeMillis();
 		}
 		int input = in.read();
 		synchronized (lock) {
-			readStartedNs = -1;
+			readStartedMs = -1;
 		}
 		return input;
 	}
@@ -47,11 +47,11 @@ class TimeoutInputStream extends InputStream {
 	@Override
 	public int read(byte[] b, int off, int len) throws IOException {
 		synchronized (lock) {
-			readStartedNs = clock.nanoTime();
+			readStartedMs = clock.currentTimeMillis();
 		}
 		int read = in.read(b, off, len);
 		synchronized (lock) {
-			readStartedNs = -1;
+			readStartedMs = -1;
 		}
 		return read;
 	}
@@ -92,8 +92,8 @@ class TimeoutInputStream extends InputStream {
 
 	boolean hasTimedOut() {
 		synchronized (lock) {
-			return readStartedNs != -1 &&
-					clock.nanoTime() - readStartedNs > timeoutNs;
+			return readStartedMs != -1 &&
+					clock.currentTimeMillis() - readStartedMs > timeoutMs;
 		}
 	}
 
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/io/TimeoutMonitorImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/io/TimeoutMonitorImpl.java
index 25ea97869..eb68cb3a4 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/io/TimeoutMonitorImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/io/TimeoutMonitorImpl.java
@@ -52,7 +52,7 @@ class TimeoutMonitorImpl implements TimeoutMonitor {
 	public InputStream createTimeoutInputStream(InputStream in,
 			long timeoutMs) {
 		TimeoutInputStream stream = new TimeoutInputStream(clock, in,
-				timeoutMs * 1_000_000, this::removeStream);
+				timeoutMs, this::removeStream);
 		synchronized (lock) {
 			if (streams.isEmpty()) {
 				task = scheduler.scheduleWithFixedDelay(this::checkTimeouts,
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/system/SystemClock.java b/bramble-core/src/main/java/org/briarproject/bramble/system/SystemClock.java
index 648578a1a..b1737ad80 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/system/SystemClock.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/system/SystemClock.java
@@ -12,11 +12,6 @@ public class SystemClock implements Clock {
 		return System.currentTimeMillis();
 	}
 
-	@Override
-	public long nanoTime() {
-		return System.nanoTime();
-	}
-
 	@Override
 	public void sleep(long milliseconds) throws InterruptedException {
 		Thread.sleep(milliseconds);
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabaseTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabaseTest.java
index ef26a479c..ac4231216 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabaseTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabaseTest.java
@@ -2420,11 +2420,6 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 			return time;
 		}
 
-		@Override
-		public long nanoTime() {
-			return time * 1_000_000;
-		}
-
 		@Override
 		public void sleep(long milliseconds) throws InterruptedException {
 			Thread.sleep(milliseconds);
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/io/TimeoutInputStreamTest.java b/bramble-core/src/test/java/org/briarproject/bramble/io/TimeoutInputStreamTest.java
index 6a5c75975..3760210d2 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/io/TimeoutInputStreamTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/io/TimeoutInputStreamTest.java
@@ -36,7 +36,7 @@ public class TimeoutInputStreamTest extends BrambleTestCase {
 		in = new UnresponsiveInputStream();
 		listenerCalled = new AtomicBoolean(false);
 		stream = new TimeoutInputStream(new SettableClock(time), in,
-				TIMEOUT_MS * 1_000_000, stream -> listenerCalled.set(true));
+				TIMEOUT_MS, stream -> listenerCalled.set(true));
 		readReturned = new CountDownLatch(1);
 	}