Revert "remove __jid__ poops"

Fixed in https://github.com/saltstack/salt/commit/6ca4860f00c216decc94dc7a4c09700922ac325b

This reverts commit 522a6d072dc3cc9e6241996eeff8f261582dd712.