Missing from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8787. Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/27805.