Revert scheduler change in 20873e6
Revert scheduler change in 20873e6

Accidentally included unfinished work

diegocepedaw/oncall,diegocepedaw/oncall,dwang159/oncall,dwang159/oncall,diegocepedaw/oncall,dwang159/oncall,diegocepedaw/oncall,dwang159/oncall