diff --git a/NEWS b/NEWS
index 275ffbd6bc31b22281c1015343f80454c784c416..213e39085b262ad26ae5170ed49044e4fe819969 100644
--- a/NEWS
+++ b/NEWS
@@ -19,8 +19,6 @@ documents those changes that are of interest to users and administrators.
  -- Fix missing TRES read lock in acct_policy_job_runnable_pre_select() code.
  -- Fix debug2 message printing value using wrong array index in
     _qos_job_runnable_post_select().
- -- Require the normal scheduler to set/clear an Assoc/QOS limit on a job
-    instead of also in the backfill scheduler.
 
 * Changes in Slurm 16.05.8
 ==========================
diff --git a/src/plugins/sched/backfill/backfill.c b/src/plugins/sched/backfill/backfill.c
index d1300fe85e841feb0e49514b24e2cabd34731f85..2cf7ea871d0b865939ef929e51235e97749b40ae 100644
--- a/src/plugins/sched/backfill/backfill.c
+++ b/src/plugins/sched/backfill/backfill.c
@@ -1126,10 +1126,8 @@ static int _attempt_backfill(void)
 			continue;
 		}
 
-		/* If the job is held with an assoc/qos limit let the regular
-		 * scheduler handle it.
-		 */
-		if (!acct_policy_job_runnable_state(job_ptr))
+		if (!acct_policy_job_runnable_state(job_ptr) &&
+		    !acct_policy_job_runnable_pre_select(job_ptr))
 			continue;
 
 		job_no_reserve = 0;