I have published a PR intended to address this issue:
There was a bit more functions that needed to be patched than I initially thought, so it took a bit longer.