I locally reverted r316385 and confirmed that this test fails without it. Really fixes the cause of PR35014. llvm-svn: 316392