This reverts commit 058bb835. Forgot to update another test affected by this change. llvm-svn: 354408