WIP: fix job re-queueing on TERM signal.