FileCheck is crashing on in the input file, so reverting again while I investigate. This reverts r308023. llvm-svn: 308030