diff --git a/[refs] b/[refs]
index 4b298acf528a..3cde2117fb9b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd7c092e711ebab55b2688d3859d95dfd0301f73
+refs/heads/master: f13945d75730081830b6f3360266950e2b7c9067
diff --git a/trunk/drivers/md/dm-thin.c b/trunk/drivers/md/dm-thin.c
index 7a66d73148e6..75159cd4c7af 100644
--- a/trunk/drivers/md/dm-thin.c
+++ b/trunk/drivers/md/dm-thin.c
@@ -2443,15 +2443,8 @@ static void set_discard_limits(struct pool_c *pt, struct queue_limits *limits)
 	if (pt->adjusted_pf.discard_passdown) {
 		data_limits = &bdev_get_queue(pt->data_dev->bdev)->limits;
 		limits->discard_granularity = data_limits->discard_granularity;
-	} else if (block_size_is_power_of_two(pool))
+	} else
 		limits->discard_granularity = pool->sectors_per_block << SECTOR_SHIFT;
-	else
-		/*
-		 * Use largest power of 2 that is a factor of sectors_per_block
-		 * but at least DATA_DEV_BLOCK_SIZE_MIN_SECTORS.
-		 */
-		limits->discard_granularity = max(1 << (ffs(pool->sectors_per_block) - 1),
-						  DATA_DEV_BLOCK_SIZE_MIN_SECTORS) << SECTOR_SHIFT;
 }
 
 static void pool_io_hints(struct dm_target *ti, struct queue_limits *limits)