See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14387

This commit was created manually via patch as recommended by the EE
compat check.