Sorry for the unit test churn. I'll try to make the change permanently next time. llvm-svn: 184705
llvm-svn: 164675