Revert "remove connected threat stuff (4617310)"

This reverts commit 1505ea75336640ff2e44b4c3eb2df2264549e83b.

bench 4509925