Finish reverting r167761, it's causing test failures.

llvm-svn: 167777
1 file changed