Revert "Revert non-functioning thread killer"

This reverts commit a1b07cb9ddb2b5751906b7022cb7398bbe17b650.