This reverts commit 8f85685b, which breaks on old gcc that have the macro + raw strings bug. llvm-svn: 370262