Recommit this change and remove the failing part of the test - it didn't

pass in the first place and was masked by earlier failures not warning
and aborting the block.

llvm-svn: 119184