Revert "Merge branch 'upgrade-flipper' into 'master'" See merge request gitlab-org/gitlab!95651
mentioned in commit daf872e9