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