diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index 8f6c26f..4371333 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -1270,15 +1270,14 @@
 void av1_set_speed_features_qindex_dependent(AV1_COMP *cpi, int speed) {
   AV1_COMMON *const cm = &cpi->common;
   SPEED_FEATURES *const sf = &cpi->sf;
-  (void)cm;
-  (void)sf;
-  (void)speed;
-  /* Turn trellis off
   const int is_720p_or_larger = AOMMIN(cm->width, cm->height) >= 720;
-  if (is_720p_or_larger && speed == 0) {
-    if (cm->base_qindex < 96) {
-      sf->rd_sf.optimize_coefficients = NO_TRELLIS_OPT;
+  if (is_720p_or_larger && cpi->oxcf.mode == GOOD && speed == 0) {
+    if (cm->base_qindex <= 80) {
+      sf->part_sf.simple_motion_search_split =
+          cm->allow_screen_content_tools ? 1 : 2;
+      sf->tx_sf.inter_tx_size_search_init_depth_rect = 1;
+      sf->tx_sf.inter_tx_size_search_init_depth_sqr = 1;
+      sf->tx_sf.intra_tx_size_search_init_depth_rect = 1;
     }
   }
-  */
 }