Revert "Dirty Hack to fix SetupWizard"

This reverts commit 9f71d75f4ad56f749085189925bce4ab4d52ab49.