diff --git a/src/bees-context.cc b/src/bees-context.cc
index 6dd0850..bd042b4 100644
--- a/src/bees-context.cc
+++ b/src/bees-context.cc
@@ -845,24 +845,6 @@ BeesContext::resolve_addr_uncached(BeesAddress addr)
 	// transaction latency, competing threads, and freeze/SIGSTOP
 	// pausing the bees process.
 
-	// There can be only one of these running at a time, or some lingering
-	// backref bug will kill the whole system.  Also it looks like there
-	// are so many locks held while LOGICAL_INO runs that there is no
-	// point in trying to run two of them on the same filesystem.
-	// ...but it works most of the time, and the performance hit from
-	// not running resolve in multiple threads is significant.
-	// But "most of the time" really just means "between forced reboots",
-	// and with recent improvements in kernel uptime, this is now in the
-	// top 3 crash causes.
-	static mutex s_resolve_mutex;
-	unique_lock<mutex> lock(s_resolve_mutex, defer_lock);
-	if (BEES_SERIALIZE_RESOLVE) {
-		BEESNOTE("waiting to resolve addr " << addr);
-		lock.lock();
-	}
-
-	// Is there a bug where resolve and balance cause a crash (BUG_ON at fs/btrfs/ctree.c:1227)?
-	// Apparently yes, and more than one.
 	// Wait for the balance to finish before we run LOGICAL_INO
 	wait_for_balance();
 
diff --git a/src/bees.h b/src/bees.h
index e4c6efb..b785167 100644
--- a/src/bees.h
+++ b/src/bees.h
@@ -110,9 +110,6 @@ const size_t BEES_TRANSID_FACTOR = 10;
 // Wait this long for a balance to stop
 const double BEES_BALANCE_POLL_INTERVAL = 60.0;
 
-// Workaround for backref bugs
-const bool BEES_SERIALIZE_RESOLVE = false;
-
 // Workaround for tree mod log bugs
 const bool BEES_SERIALIZE_BALANCE = false;