Reverting to old RunningJobManager