Intermediary fix for the new project wizard, (related to BZ-1017886).
(cherry-picked from a3eb196)