HIVE-8834-norefac: wrap everything in a job