This is mostly a revert of 992757cc
and bc78ac68, with tweaks to apply.
Also only MSVC support for now.

Change-Id: Ia926b3c28125b52012156ccfd47932837b09d20a