Merge pull request #8111 from apple/revert-8099-wip-capture-propagation-generics

Revert "[sil-capture-propagation] Switch to the new notifyAddFunction API"