Revert to previous state befor introducing hpc switch

* HPC switch does not work because it is determined when all jobs had
been scheduled already.