As I see, bug was introduced with change-id Ia8db615284644b0e2bcdb70c1c7bb1f4388d5e46 in 6.0 release. Later this piece of code was refactored and issue disappeared. So I suggest to abandon workaround for already fixed bug.
Possibly we could apply it to stable/6.0 branch. But it will produce difference between the branches and will add possibility for conflicts in future backports. So my proposal here is to set Won't Fix for stable/6.0 branch for this bug.
As I see, bug was introduced with change-id Ia8db615284644b 0e2bcdb70c1c7bb 1f4388d5e46 in 6.0 release. Later this piece of code was refactored and issue disappeared. So I suggest to abandon workaround for already fixed bug.
Possibly we could apply it to stable/6.0 branch. But it will produce difference between the branches and will add possibility for conflicts in future backports. So my proposal here is to set Won't Fix for stable/6.0 branch for this bug.