diff --git a/av1/encoder/partition_search.c b/av1/encoder/partition_search.c
index 5fce264..03ecbf6 100644
--- a/av1/encoder/partition_search.c
+++ b/av1/encoder/partition_search.c
@@ -1657,18 +1657,14 @@
     BLOCK_SIZE bsize) {
   if (part_sf->partition_search_type != VAR_BASED_PARTITION) return 0;
   if (part_sf->adjust_var_based_rd_partitioning == 0 ||
-      part_sf->adjust_var_based_rd_partitioning > 3)
+      part_sf->adjust_var_based_rd_partitioning > 2)
     return 0;
 
-  if (part_sf->adjust_var_based_rd_partitioning == 1) {
-    return bsize <= BLOCK_32X32;
-  } else {
-    if (bsize <= BLOCK_32X32) return 1;
+  if (bsize <= BLOCK_32X32) return 1;
+  if (part_sf->adjust_var_based_rd_partitioning == 2) {
     const int is_larger_qindex = cm->quant_params.base_qindex > 190;
-    if (part_sf->adjust_var_based_rd_partitioning == 2) {
-      const int is_360p_or_larger = AOMMIN(cm->width, cm->height) >= 360;
-      return is_360p_or_larger && is_larger_qindex && bsize == BLOCK_64X64;
-    }
+    const int is_360p_or_larger = AOMMIN(cm->width, cm->height) >= 360;
+    return is_360p_or_larger && is_larger_qindex && bsize == BLOCK_64X64;
   }
   return 0;
 }
@@ -1919,7 +1915,7 @@
   }
 
   if ((cpi->sf.part_sf.partition_search_type == VAR_BASED_PARTITION &&
-       cpi->sf.part_sf.adjust_var_based_rd_partitioning > 3) &&
+       cpi->sf.part_sf.adjust_var_based_rd_partitioning > 2) &&
       partition != PARTITION_SPLIT && bsize > BLOCK_8X8 &&
       (mi_row + bs < mi_params->mi_rows ||
        mi_row + hbs == mi_params->mi_rows) &&
diff --git a/av1/encoder/speed_features.h b/av1/encoder/speed_features.h
index 3d8bc6c..051e025 100644
--- a/av1/encoder/speed_features.h
+++ b/av1/encoder/speed_features.h
@@ -530,9 +530,8 @@
 
   // Sets level of adjustment of variance-based partitioning during
   // rd_use_partition 0 - no partition adjustment, 1 - try to merge partitions
-  // for small blocks and high QP, 2 - try to merge partitions, 3 - always try
-  // to merge leaf partitions for small blocks, 4 - try to merge and split leaf
-  // partitions and 0 - 4 decreasing aggressiveness in order.
+  // for small blocks and high QP, 2 - try to merge partitions, 3 - try to merge
+  // and split leaf partitions and 0 - 3 decreasing aggressiveness in order.
   int adjust_var_based_rd_partitioning;
 
   // Partition search early breakout thresholds.