client.go        |  1 -
 peerconn.go      | 10 ++++------
 peerconn_test.go |  2 +-
 torrent.go       | 55 +++++++----------------------------------------------

diff --git a/client.go b/client.go
index db93e5695c80f12de7356935e3758c7101e5261d..83da43e63b160c4f2f7866773bbf62ec68b94894 100644
--- a/client.go
+++ b/client.go
@@ -1131,7 +1131,6 @@ 		webSeeds:     make(map[string]*Peer),
 		gotMetainfoC: make(chan struct{}),
 	}
 	t.networkingEnabled.Set()
-	t._pendingPieces.NewSet = priorityBitmapStableNewSet
 	t.logger = cl.logger.WithContextValue(t)
 	if opts.ChunkSize == 0 {
 		opts.ChunkSize = defaultChunkSize
diff --git a/peerconn.go b/peerconn.go
index aa03a741c33a5770ac2f067635fcff46f28140f1..a7cf7d2ead2340bd675e9f3508372e7c613b0ad1 100644
--- a/peerconn.go
+++ b/peerconn.go
@@ -777,8 +777,8 @@ 		}
 	}
 	cn.peerSentHaveAll = true
 	cn._peerPieces.Clear()
-	if cn.t._pendingPieces.Len() != 0 {
-		cn.updateRequests("have all")
+	if !cn.t._pendingPieces.IsEmpty() {
+		cn.updateRequests("Peer.onPeerHasAllPieces")
 	}
 	cn.peerPiecesChanged()
 }
@@ -1491,11 +1491,9 @@ 	if c.peerSentHaveAll {
 		return !c.t.haveAllPieces()
 	}
 	if !c.t.haveInfo() {
-		return c._peerPieces.GetCardinality() != 0
+		return !c._peerPieces.IsEmpty()
 	}
-	return c._peerPieces.Intersects(
-		roaring.FlipInt(&c.t._completedPieces, 0, c.t.numPieces()),
-	)
+	return c._peerPieces.Intersects(&c.t._pendingPieces)
 }
 
 func (c *Peer) deleteRequest(r RequestIndex) bool {
diff --git a/peerconn_test.go b/peerconn_test.go
index be88bf47b27d2d83e566748d4b444fa30a9d2dad..b6ad410c103a855eb329c11381be0757f062c22e 100644
--- a/peerconn_test.go
+++ b/peerconn_test.go
@@ -104,7 +104,7 @@ 		Length:      1 << 20,
 		PieceLength: 1 << 20,
 	}))
 	t.setChunkSize(defaultChunkSize)
-	t._pendingPieces.Set(0, PiecePriorityNormal.BitmapPriority())
+	t._pendingPieces.Add(0)
 	r, w := net.Pipe()
 	cn := cl.newConnection(r, true, r.RemoteAddr(), r.RemoteAddr().Network(), regularNetConnPeerConnConnString(r))
 	cn.setTorrent(t)
diff --git a/torrent.go b/torrent.go
index d5af3dad959f3a6f3552a20fe91eefa9ec896207..b4898364376d3667e43c47e4159f8a9fad2f3a5c 100644
--- a/torrent.go
+++ b/torrent.go
@@ -27,7 +27,6 @@ 	"github.com/anacrolix/missinggo/pubsub"
 	"github.com/anacrolix/missinggo/slices"
 	"github.com/anacrolix/missinggo/v2"
 	"github.com/anacrolix/missinggo/v2/bitmap"
-	"github.com/anacrolix/missinggo/v2/prioritybitmap"
 	"github.com/anacrolix/multiless"
 	"github.com/anacrolix/sync"
 	"github.com/davecgh/go-spew/spew"
@@ -131,7 +130,7 @@ 	_readerReadaheadPieces bitmap.Bitmap
 
 	// A cache of pieces we need to get. Calculated from various piece and
 	// file priorities and completion states elsewhere.
-	_pendingPieces prioritybitmap.PriorityBitmap
+	_pendingPieces roaring.Bitmap
 	// A cache of completed piece indices.
 	_completedPieces roaring.Bitmap
 	// Pieces that need to be hashed.
@@ -193,10 +192,6 @@ }
 
 func (t *Torrent) ignorePieceForRequests(i pieceIndex) bool {
 	return !t.wantPieceIndex(i)
-}
-
-func (t *Torrent) pendingPieces() *prioritybitmap.PriorityBitmap {
-	return &t._pendingPieces
 }
 
 // Returns a channel that is closed when the Torrent is closed.
@@ -970,32 +965,7 @@ 	return chunkIndexType(cs.Begin / chunkSize)
 }
 
 func (t *Torrent) wantPieceIndex(index pieceIndex) bool {
-	// TODO: Are these overly conservative, should we be guarding this here?
-	{
-		if !t.haveInfo() {
-			return false
-		}
-		if index < 0 || index >= t.numPieces() {
-			return false
-		}
-	}
-	p := &t.pieces[index]
-	if p.queuedForHash() {
-		return false
-	}
-	if p.hashing {
-		return false
-	}
-	if t.pieceComplete(index) {
-		return false
-	}
-	if t._pendingPieces.Contains(int(index)) {
-		return true
-	}
-	// t.logger.Printf("piece %d not pending", index)
-	return !t.forReaderOffsetPieces(func(begin, end pieceIndex) bool {
-		return index < begin || index >= end
-	})
+	return t._pendingPieces.Contains(uint32(index))
 }
 
 // A pool of []*PeerConn, to reduce allocations in functions that need to index or sort Torrent
@@ -1105,7 +1075,7 @@ 	t.openNewConns()
 }
 
 func (t *Torrent) piecePriorityChanged(piece pieceIndex, reason string) {
-	if t._pendingPieces.Contains(piece) {
+	if t._pendingPieces.Contains(uint32(piece)) {
 		t.iterPeers(func(c *Peer) {
 			if c.actualRequestState.Interested {
 				return
@@ -1128,11 +1098,11 @@ 	p := &t.pieces[piece]
 	newPrio := p.uncachedPriority()
 	// t.logger.Printf("torrent %p: piece %d: uncached priority: %v", t, piece, newPrio)
 	if newPrio == PiecePriorityNone {
-		if !t._pendingPieces.Remove(int(piece)) {
+		if !t._pendingPieces.CheckedRemove(uint32(piece)) {
 			return
 		}
 	} else {
-		if !t._pendingPieces.Set(int(piece), newPrio.BitmapPriority()) {
+		if !t._pendingPieces.CheckedAdd(uint32(piece)) {
 			return
 		}
 	}
@@ -1188,18 +1158,7 @@ 	return true
 }
 
 func (t *Torrent) piecePriority(piece pieceIndex) piecePriority {
-	prio, ok := t._pendingPieces.GetPriority(piece)
-	if !ok {
-		return PiecePriorityNone
-	}
-	if prio > 0 {
-		panic(prio)
-	}
-	ret := piecePriority(-prio)
-	if ret == PiecePriorityNone {
-		panic(piece)
-	}
-	return ret
+	return t.piece(piece).uncachedPriority()
 }
 
 func (t *Torrent) pendRequest(req RequestIndex) {
@@ -1354,7 +1313,7 @@ 	}
 	if !t.haveInfo() {
 		return true
 	}
-	return t._pendingPieces.Len() != 0
+	return !t._pendingPieces.IsEmpty()
 }
 
 func appendMissingStrings(old, new []string) (ret []string) {