Alternative fix to 50023eab75. Pull Request: https://projects.blender.org/blender/blender/pulls/137962
50023eab75