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