Follow-up on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19576#note_80549397
For reasons see https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19576#why-was-this-mr-needed