Revert "Merge branch 'revert-82d7b5a0-ce' into 'master'"

What does this MR do?

Revert the revert https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25537 that fixed the issues caused on master on the 25th of Feb. I will target fixes that I prepared to this MR and the changes can be re-merged with the fixes.

CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9704, please see the additional fixes https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9704#fixes

What are the relevant issue numbers?

Does this MR meet the acceptance criteria?

• Changelog entry added, if necessary
• Documentation created/updated via this MR
• Documentation reviewed by technical writer or follow-up review issue created
• Tests added for this feature/bug
• Tested in all supported browsers
• Conforms to the code review guidelines
• Conforms to the merge request performance guidelines
• Conforms to the style guides
• Conforms to the database guides
• Link to e2e tests MR added if this MR has Requires e2e tests label. See the Test Planning Process.
• Security reports checked/validated by reviewer