it seems to be breaking self-host for a few people and is PR14592. This reverts commit r170024. llvm-svn: 170106