Revert changes that are to be resolved in #9002
Revert changes that are to be resolved in #9002

NeoAdonis/osu,ppy/osu,peppy/osu,smoogipoo/osu,UselessToucan/osu,NeoAdonis/osu,ppy/osu,ppy/osu,peppy/osu,UselessToucan/osu,NeoAdonis/osu,smoogipoo/osu,smoogipoo/osu,peppy/osu-new,peppy/osu,smoogipooo/osu,UselessToucan/osu