Pr #2041 needs to be unmerged

[Solaris7518]

Description

Pr #2041 needs to be unmerged before the next upstream merge otherwise things may break
Reproduction

No reproduction needed.
Screenshots

No screenshots needed.
Additional context

I'll look into doing this myself but i wouldn't mind if someone did this before I get the chance to.

[Solaris7518]

Only reason why this should be done is because the last time i tested the new soundfont with this pr still merged in my dev environment it literally crashed the client and server when i tried to play music, and will most likely happen in the server too if this doesnt happen before that new soundfont from upstream is merged.

[Solaris7518]

Though to be fair, part of that issue may have been because my dev environment is a literal nuclear bomb that detonates itself if you even breathe on it so it may just be a skill issue on my end as well.

[HTMLSystem]

Did you try to see what happened in release mode?

[Solaris7518]

Yeah it did the same thing.