Co-authored-by: classabbyamp <void@placeviolette.net> fixes: #54803 closes: #54835 [via git-merge-pr]