Revert accidental commit I had to make to get the test case in PR17268 to still work correctly.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@190917 91177308-0d34-0410-b5e6-96231b3b80d8