diff --git a/CHANGELOG.md b/CHANGELOG.md
index 683ce6bbae3..63f72e6b317 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re
 - [#7083](https://github.com/thanos-io/thanos/pull/7083) Store Gateway: Fix lazy expanded postings with 0 length failed to be cached.
 - [#7080](https://github.com/thanos-io/thanos/pull/7080) Receive: race condition in handler Close() when stopped early
 - [#7132](https://github.com/thanos-io/thanos/pull/7132) Documentation: fix broken helm installation instruction
+- [#7134](https://github.com/thanos-io/thanos/pull/7134) Store, Compact: Revert the recursive block listing mechanism introduced in https://github.com/thanos-io/thanos/pull/6474 and use the same strategy as in 0.31. Introduce a `--block-discovery-strategy` flag to control the listing strategy so that a recursive lister can still be used if the tradeoff of slower but cheaper discovery is preferred.
 
 ### Added
 
diff --git a/docs/components/compact.md b/docs/components/compact.md
index 91e6fd04c64..d210dd55a83 100644
--- a/docs/components/compact.md
+++ b/docs/components/compact.md
@@ -279,15 +279,6 @@ usage: thanos compact [<flags>]
 Continuously compacts blocks in an object store bucket.
 
 Flags:
-      --block-discovery-strategy="concurrent"
-                                One of concurrent, recursive. When set to
-                                concurrent, stores will concurrently issue
-                                one call per directory to discover active
-                                blocks in the bucket. The recursive strategy
-                                iterates through all objects in the bucket,
-                                recursively traversing into each directory.
-                                This avoids N+1 calls at the expense of having
-                                slower bucket iterations.
       --block-files-concurrency=1
                                 Number of goroutines to use when
                                 fetching/uploading block files from object
diff --git a/docs/components/store.md b/docs/components/store.md
index cf96bfdf4c1..8ecc53d68fd 100644
--- a/docs/components/store.md
+++ b/docs/components/store.md
@@ -29,15 +29,6 @@ Store node giving access to blocks in a bucket provider. Now supported GCS, S3,
 Azure, Swift, Tencent COS and Aliyun OSS.
 
 Flags:
-      --block-discovery-strategy="concurrent"
-                                 One of concurrent, recursive. When set to
-                                 concurrent, stores will concurrently issue
-                                 one call per directory to discover active
-                                 blocks in the bucket. The recursive strategy
-                                 iterates through all objects in the bucket,
-                                 recursively traversing into each directory.
-                                 This avoids N+1 calls at the expense of having
-                                 slower bucket iterations.
       --block-meta-fetch-concurrency=32
                                  Number of goroutines to use when fetching block
                                  metadata from object storage.