#pragma warning(disable : N)
This reverts commit 0cd9d8a48b and adds the changes described in https://reviews.llvm.org/D110668#3034461.
0cd9d8a48b