Revert "Crash on startup XP maybe fix"

This reverts commit 8761a2fb00c00859d49c404834430874ce070ceb.
Crash on startup XP maybe fix