Revert "Fix a problem with 7fd094be590a96dee9edc832c14577e6b550b704."

This reverts commit 5816ad6b9a8911634917498b953f3f8b64922fae.

Revert this as it breaks the windows installer.
Revert "Fix the location of xsp4 on windows. Hopefully fixes #11003."

This reverts commit 7fd094be590a96dee9edc832c14577e6b550b704.

Revert this as it breaks the windows installer.