The cause for the revert should be fixed by r373513 / a80b6c15 This reverts commit 47dbcbd8. llvm-svn: 373522