GitLab

We're a semver v1, so we can't remove exposed APIs unless we bump to
v2+. Bumping the major version to just rename two APIs seems a bit
overkill; keeping the old ones around and deprecating them is much
easier.

This partially reverts commit b8473079.