Indeed, this commit didn't fixed the issue and we realized that.
That's why we didn't close this bug report.
It should be safely fixed soon, after we complete tests on this part.