Restore changes from:
What does this MR do?
Restore changes from: 190afc62
It was lost during a conflict resolution in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22772
This is discovered in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8246 because it's causing a conflict in CE -> EE (EE is correct here)
/cc @mlapierre
@dbalexandre Please review? Thanks!