Merge "Revert "Fixes windows error introduced in CL 345105""