diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 8dcae9a24b7..29c15741347 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -2138,15 +2138,9 @@ find_best(JOIN *join,table_map rest_tables,uint idx,double record_count,
 		    x = used key parts (1 <= x <= c)
 		  */
 		  double rec_per_key;
-#if 0
-		  if (!(rec_per_key=(double)
-			keyinfo->rec_per_key[keyinfo->key_parts-1]))
-		    rec_per_key=(double) s->records/rec+1;
-#else
                   rec_per_key= keyinfo->rec_per_key[keyinfo->key_parts-1] ?
 		    (double) keyinfo->rec_per_key[keyinfo->key_parts-1] :
 		    (double) s->records/rec+1;   
-#endif
 
 		  if (!s->records)
 		    tmp=0;