Reverting a quick fix which didn't solve the root cause. The root cause was fixed by #121723. Pull Request: https://projects.blender.org/blender/blender/pulls/121726
Reverting a quick fix which didn't solve the root cause. The root cause was fixed by #121723. Pull Request: https://projects.blender.org/blender/blender/pulls/121726