Remove ugly and horrible code. It's not necessary for correctness, and can be...

Remove ugly and horrible code.  It's not necessary for correctness, and can be added back later if it causes code quality issues.

llvm-svn: 44986