diff --git a/sys/i386/cpufreq/est.c b/sys/i386/cpufreq/est.c
index bfc8178b6de1..ac99e040257b 100644
--- a/sys/i386/cpufreq/est.c
+++ b/sys/i386/cpufreq/est.c
@@ -1078,7 +1078,8 @@ est_acpi_info(device_t dev, freq_info **freqs)
 	struct cf_setting *sets;
 	freq_info *table;
 	device_t perf_dev;
-	int count, error, i, j, maxi, maxfreq;
+	int count, error, i, j;
+	uint16_t saved_id16;
 
 	perf_dev = device_find_child(device_get_parent(dev), "acpi_perf", -1);
 	if (perf_dev == NULL || !device_is_attached(perf_dev))
@@ -1101,7 +1102,7 @@ est_acpi_info(device_t dev, freq_info **freqs)
 		error = ENOMEM;
 		goto out;
 	}
-	maxi = maxfreq = 0;
+	est_get_id16(&saved_id16);
 	for (i = 0, j = 0; i < count; i++) {
 		/*
 		 * Confirm id16 value is correct.
@@ -1118,24 +1119,11 @@ est_acpi_info(device_t dev, freq_info **freqs)
 				table[j].id16 = sets[i].spec[0];
 				table[j].power = sets[i].power;
 				++j;
-				if (sets[i].freq > maxfreq) {
-					maxi = i;
-					maxfreq = sets[i].freq;
-				}
-
 			}
-			/* restore saved setting */
-			est_set_id16(dev, sets[i].spec[0], 0);
 		}
 	}
-	/*
-	 * Set the frequency to max, so we get through boot fast, and don't
-	 * handicap systems not running powerd.
-	 */
-	if (maxfreq != 0) { 
-		device_printf(dev, "Setting %d MHz\n", sets[maxi].freq);
-		est_set_id16(dev, sets[maxi].spec[0], 0);
-	}
+	/* restore saved setting */
+	est_set_id16(dev, saved_id16, 0);
 
 	/* Mark end of table with a terminator. */
 	bzero(&table[j], sizeof(freq_info));