I believe this PR would have a similar effect like your fork.
I added a comment to chase the maintainer to see if the PR could be merged.
THank you!