The proposed fix looks sufficient.
As for backporting, only back to 6.0.x should be sufficient I think. 5.x is old enough to probably be left as “shelved”.