Revert "Automatic merge of gitlab-org/gitlab-ce master"

What does this MR do?

This reverts https://gitlab.com/gitlab-org/gitlab-ee/commit/82d7b5a03562191bcdc5ce17cc7388af85e5bde3 since it seemed to have introduced a lot of failures in issue-related feature specs.

CE Port: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25537

What are the relevant issue numbers?

Tries to address https://gitlab.com/gitlab-org/gitlab-ee/issues/9980.

Does this MR meet the acceptance criteria?

• Conforms to the code review guidelines
• Conforms to the merge request performance guidelines
• Conforms to the style guides
• Conforms to the database guides
• Security reports checked/validated by reviewer