Reviewed by Andy llvm-svn: 197315
This reverts commit r197253. This was a great change, but Juergen should be the commit author. llvm-svn: 197262
llvm-svn: 197253