the revert in 282944caac was incomplete this commit restores the missing bits needed to make blender run again.
282944caac