revert Github Windows Client suggested changes