Fixes #9998 Supersedes #10107 Co-Authored-By: gensokyo-dev <342580529+gensokyo-dev@users.noreply.github.com>