Undo change to AppSetup, following explanation from maciejs
(cherry picked from commit 0e7d9044b8c1fb4e448fd9a25a8ca7cf13ad8cd5)