Revert "Force job id to job"

This reverts commit 0efa6d5c48d5ab39d60affeac47331afa01919c7.