This reverts commit d10ee1ce. REASON: win_sdk is not happy with my migration :-( Change-Id: I2ed196da3f5883112883525f883d25b36e48352a