Revert scheduler changes

The scheduler changes can result in smaller queries being starved
by bigger queries due to the introduction of global per-node queues.
Reverting for now so we can release. We'll revisit later.