Revert "Bugfix: configuration wizard crash 2 #1077"

This reverts commit 55c413627f8545fb5d2b75efb157d30689985d53.