This reverts r255170. This change caused a bunch of bot failures and needs to be revised. llvm-svn: 255184