Reverting 58e1e88dc3 because of concerns by reviewer.
Pull Request: https://projects.blender.org/blender/blender/pulls/117241
Reverting 58e1e88dc3 because of concerns by reviewer.
Pull Request: https://projects.blender.org/blender/blender/pulls/117241