Another blind fix attempt for WNT

Change-Id: I369f3db3d72c93531e753b16fbd97abce4e1c0ed