PR #2089 regresses some scenarios where the VC toolset is not the default toolset for the version of VS. For example, Visual Studio 2019 + v141. We will need to back out this PR for 1.9.0 or scope it down such that it doesn't break this scenario.
