EE-specific line changes were introduced in the following MR:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/12680

This change resolves most of them