See this PR for the code changes that should be ported: https://github.com/FasterMelee/6.0-wip/commit/afa7c7a26e415a43eaf5d2e015e4ec9f72e40af4