This reverts r234984 since it seems to break some bots (most of them seemed arm*-selfhost). llvm-svn: 234998