[Fixes #71525138] This time!