The latter is obsoleted by the former, and is more amenable to commit
limiting, which will come in a later commit.

Changelog: performance