Another monkeypatch bites the dust.

AFAIK there is no regression in functionality. But please test
yourselves too to double check.