Yep. Probably worth it. You could also do this with a monkeypatch method to "opt in" to this change.