This reverts commit r332923 which is no longer needed since its use has been reverted in r337033. llvm-svn: 337039