This suggests the simpler fix might actually be correcting a deviation from documented behavior, rather than introducing new behavior requiring a new parameter (as in 5396).
+1, I think the docs have the right idea here which is "try until we get exactly what we want"