Missed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16985 & https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4824
/cc @stanhu @ckatanda