diff --git a/libtransmission/peer.c b/libtransmission/peer.c
index bd164e126..1de11c179 100644
--- a/libtransmission/peer.c
+++ b/libtransmission/peer.c
@@ -522,23 +522,13 @@ int tr_peerIsIncoming( tr_peer_t * peer )
 }
 
 /***********************************************************************
- * tr_peerIsUploading
+ * tr_peerIsChoking
  ***********************************************************************
  *
  **********************************************************************/
-int tr_peerIsUploading( tr_peer_t * peer )
+int tr_peerIsChoking( tr_peer_t * peer )
 {
-    return ( peer->inRequestCount > 0 );
-}
-
-/***********************************************************************
- * tr_peerIsDownloading
- ***********************************************************************
- *
- **********************************************************************/
-int tr_peerIsDownloading( tr_peer_t * peer )
-{
-    return peer->outBlockSending;
+    return peer->peerChoking;
 }
 
 /***********************************************************************
diff --git a/libtransmission/peer.h b/libtransmission/peer.h
index f048c04e5..a8bfd6434 100644
--- a/libtransmission/peer.h
+++ b/libtransmission/peer.h
@@ -43,8 +43,6 @@ uint8_t *   tr_peerHash          ( tr_peer_t * );
 int         tr_peerPulse         ( tr_torrent_t * );
 int         tr_peerIsConnected   ( tr_peer_t * );
 int         tr_peerIsIncoming    ( tr_peer_t * );
-int         tr_peerIsUploading   ( tr_peer_t * );
-int         tr_peerIsDownloading ( tr_peer_t * );
 float       tr_peerProgress      ( tr_peer_t * );
 int         tr_peerPort          ( tr_peer_t * );
 uint8_t *   tr_peerBitfield      ( tr_peer_t * );
diff --git a/libtransmission/transmission.c b/libtransmission/transmission.c
index 6fedb59bf..bf3910cba 100644
--- a/libtransmission/transmission.c
+++ b/libtransmission/transmission.c
@@ -436,12 +436,11 @@ tr_stat_t * tr_torrentStat( tr_torrent_t * tor )
             {
                 (s->peersIncoming)++;
             }
-            
-            if( tr_peerIsUploading( peer ) )
+            if( !tr_peerIsChoking( peer ) )
             {
                 (s->peersUploading)++;
             }
-            if( tr_peerIsDownloading( peer ) )
+            if( tr_peerIsUnchoked( peer ) )
             {
                 (s->peersDownloading)++;
             }
@@ -528,11 +527,11 @@ tr_peer_stat_t * tr_torrentPeers( tr_torrent_t * tor, int * peerCount )
             peers[i].progress      = tr_peerProgress( peer );
             peers[i].port          = tr_peerPort( peer );
             
-            if( ( peers[i].isDownloading = tr_peerIsDownloading( peer ) ) )
+            if( ( peers[i].isDownloading = tr_peerIsUnchoked( peer ) ) )
             {
                 peers[i].uploadToRate = tr_peerUploadRate( peer );
             }
-            if( ( peers[i].isUploading = tr_peerIsUploading( peer ) ) )
+            if( ( peers[i].isUploading = !tr_peerIsChoking( peer ) ) )
             {
                 peers[i].downloadFromRate = tr_peerDownloadRate( peer );
             }