Commit 656e8ce (#2208) removed most usages, but missed one and one was re-added. Since all usages are removed, it should be much easier to notice regressions.
656e8ce