This reverts commit b4be954856.
It is causing render artifacts in the barbershop benchmark. There were some
conflicts to resolve when reverting this, mainly related to the removal of
3D textures.
Fix #144713
Ref #140671, #144712
Pull Request: https://projects.blender.org/blender/blender/pulls/144880