Make threat detectors usable again.
Merge pull request #1767 from eswordthecat/patch-5

Make threat detectors usable again.