Reverted jihad commit
Merge pull request #240 from ndomar/revert_jihad_merge

Reverted jihad commit