diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index ba8793dc8529b74d7a7cfb0d61cbc1b0b2c85ea3..5155840ca7570122721f9859dd1420c482ea86d9 100644
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -882,6 +882,10 @@ void vp8_set_speed_features(VP8_COMP *cpi)
 
             sf->improved_quant = 0;
             sf->improved_dct = 0;
+
+            sf->use_fastquant_for_pick = 1;
+            sf->no_skip_block4x4_search = 0;
+            sf->first_step = 1;
         }
 
         if (Speed > 1)