e273fb4226
This reverts commit d9caa19ec2.
This commit doesn't compile, and when fixing the issues, doesn't start
blender.