Merge "Remove duplicate code"

diff --git a/vp9/encoder/vp9_speed_features.c b/vp9/encoder/vp9_speed_features.c
index d6b6174..adad800 100644
--- a/vp9/encoder/vp9_speed_features.c
+++ b/vp9/encoder/vp9_speed_features.c

@@ -269,9 +269,6 @@
     sf->partition_search_type = SOURCE_VAR_BASED_PARTITION;
     sf->search_type_check_frequency = 50;
     sf->source_var_thresh = 360;
-
-    sf->use_nonrd_pick_mode = 1;
-    sf->search_method = FAST_DIAMOND;
   }
 
   if (speed >= 7) {