Closes gitlab-org/gitlab#328956 (closed).
Pick up https://github.com/argoproj/gitops-engine/pull/271.