This reverts commit r184816. With Chandler's change in r184929, this should no longer be necessary. llvm-svn: 184961