am aa997294: Merge "Revert "Add temporary functor lifetime logging"" into jb-dev

* commit 'aa9972943cab627db9b10e5c9c4bb80f99f8a4bd':
  Revert "Add temporary functor lifetime logging"