Switch to non-per-builder schedulers