This issue has been fixed in 6.1.
For now, we don't have a plan to backport this fix as it's a bit intrusive.