This reverts commit ce0406b97b. Reports on blender-coders mentioned that it could fail on startup.
ce0406b97b