Merge "Remove Windows workaround in file not built for Windows." into main