filippocastelli/fix_startup_crashes
master
This reverts commit 1dd7405244 and fixes startup crashes.
1dd7405244