As a clean and backward compatible fix is already provided (with two optional parameters) I do not see a reason to update the pull request to something that would also change the default behavior unless the current one is considered a bug and removing the two conditions is considered a fix. Anyhow, not my call.

Concerning it being legacy code, I think PAT uses that by default in 70X.