This is the squashed together change from
https://gitlab.com/gitlab-org/gitlab/merge_requests/19623
that had been reverted previously.

Based on the refactoring in
https://gitlab.com/gitlab-org/gitlab/merge_requests/21130