Re-add back in the slow way of determining of a clean-up should become a

catch-all. The "dominates" way won't catch all of the selectors which must be
changed.

llvm-svn: 99850