Restore the name of a widely used function #361

The function turns out to be used in several places, so renaming it to
make more sense in just one context wound up not being sensible.