Commiting a revert from dgregor of a bit of destructor logic until we can

figure out how not to break lots of code using this. See PR6358 and PR6359 for
motivating examples. FIXME's left in the code and the test.

llvm-svn: 96733