diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c b/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c
index cb5787017492..d51417f4992a 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c
@@ -642,15 +642,7 @@ ar5416LoadNF(struct ath_hal *ah, const struct ieee80211_channel *chan)
 	OS_REG_SET_BIT(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_NF);
 
 	/* Wait for load to complete, should be fast, a few 10s of us. */
-	/*
-	 * XXX For now, don't be so aggressive in waiting for the NF
-	 * XXX load to complete. A very busy 11n RX load will cause this
-	 * XXX to always fail; so just leave it.
-	 * XXX Later on we may wish to split longcal into two parts - one to do
-	 * XXX the initial longcal, and one to load in an updated NF value
-	 * XXX once it's finished - say, by checking it every 500ms.
-	 */
-	if (! ar5212WaitNFCalComplete(ah, 5)) {
+	if (! ar5212WaitNFCalComplete(ah, 1000)) {
 		/*
 		 * We timed out waiting for the noisefloor to load, probably due to an
 		 * in-progress rx. Simply return here and allow the load plenty of time