Revert "Synced from windoz"

This reverts commit 57db004e88b195103f0a347326c2dfdf288ccaee.