Windwalker Update
Revert "Windwalker Update"

This reverts commit b7d9607664e921af4af00ae5acf6900ec6fd68f1.