This restores commit 98ed423361 and follow on fix 00c22351ba, which were reverted in 5d938eb6f7 due to an MSVC bot failure. I've included a fix for that failure. Differential Revision: https://reviews.llvm.org/D135714
98ed423361
00c22351ba
5d938eb6f7