This reverts commit 37be74885946f18dbeb70343ad659924c61d2549/ relands https://reviews.llvm.org/D116417 now that the internal issue has been fixed.