Restore https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12499 by reverting https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12557 now that https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12560 is merged.