This reverts commit 2fb607aa.

In fact it was used, but this went unnoticed because it wasn't
namespaced, so the thing using it wasn't obvious.