EE Port of: Remove fixes for MR refactor regressions from master

See merge request gitlab-org/gitlab-ee!6744