revert a hunk of code that Argiris added in r106213, which is the

root cause of PR7481 and probably more, and has no apparent 
testcases.  I don't understand the logic here so I can't repair it.

llvm-svn: 108119