diff --git a/router/java/src/net/i2p/router/transport/BandwidthLimitedInputStream.java b/router/java/src/net/i2p/router/transport/BandwidthLimitedInputStream.java
index 13b8b9f08..2ba779a6a 100644
--- a/router/java/src/net/i2p/router/transport/BandwidthLimitedInputStream.java
+++ b/router/java/src/net/i2p/router/transport/BandwidthLimitedInputStream.java
@@ -18,31 +18,53 @@ import net.i2p.router.RouterContext;
 public class BandwidthLimitedInputStream extends FilterInputStream {
     private RouterIdentity _peer;
     private RouterContext _context;
+    private boolean _pullFromOutbound;
+    
     public BandwidthLimitedInputStream(RouterContext context, InputStream source, RouterIdentity peer) {
+        this(context, source, peer, false);
+    }
+    /**
+     * @param pullFromOutbound even though this is an input stream, if this is true, use the
+     *                         context's outbound bandwidth limiter queue for delays
+     */
+    public BandwidthLimitedInputStream(RouterContext context, InputStream source, RouterIdentity peer, boolean pullFromOutbound) {
         super(source);
         _context = context;
         _peer = peer;
+        _pullFromOutbound = pullFromOutbound;
     }
     
     public int read() throws IOException {
-        _context.bandwidthLimiter().delayInbound(_peer, 1);
+        if (_pullFromOutbound)
+            _context.bandwidthLimiter().delayOutbound(_peer, 1);
+        else
+            _context.bandwidthLimiter().delayInbound(_peer, 1);
         return in.read();
     }
     
     public int read(byte dest[]) throws IOException {
         int read = in.read(dest);
-        _context.bandwidthLimiter().delayInbound(_peer, read);
+        if (_pullFromOutbound)
+            _context.bandwidthLimiter().delayOutbound(_peer, read);
+        else
+            _context.bandwidthLimiter().delayInbound(_peer, read);
         return read;
     }
     
     public int read(byte dest[], int off, int len) throws IOException {
         int read = in.read(dest, off, len);
-        _context.bandwidthLimiter().delayInbound(_peer, read);
+        if (_pullFromOutbound)
+            _context.bandwidthLimiter().delayOutbound(_peer, read);
+        else
+            _context.bandwidthLimiter().delayInbound(_peer, read);
         return read;
     }
     public long skip(long numBytes) throws IOException {
         long skip = in.skip(numBytes);
-        _context.bandwidthLimiter().delayInbound(_peer, (int)skip);
+        if (_pullFromOutbound)
+            _context.bandwidthLimiter().delayOutbound(_peer, (int)skip);
+        else
+            _context.bandwidthLimiter().delayInbound(_peer, (int)skip);
         return skip;
     }
 }