Revert "No need to lookup via scope as we already have the exact job id."

This reverts commit e2e96b7a281f385c8a92120638bd1cf62c81ab2d.