Was reverted in r363379 due to build breakage. Thanks to Nico Weber for reverting the original and suggesting the fix. Please see https://reviews.llvm.org/D61697 llvm-svn: 363502