Revert "Merge branch 'merge-to-mock-main-jh' into 'main-jh'"

Related issue: https://jihulab.com/gitlab-cn/gitlab/-/issues/2715

This reverts merge request !18 (merged)