make it same time conflic 1 from windows github

make it same time conflic 1 from windows github
Revert "make it same time conflic 1 from windows github"

This reverts commit 7f8bdd079a194823a984c6f30b7d0eb5f796a35b.