This reverts commit 85eaa98980. Conflicts: source/blender/editors/space_view3d/view3d_draw.c
85eaa98980