Scheduling tweak

Partial reversion of commit 9b1dadea4eb823b5ef29d8b4ee56cb6b7c3be22f