Revert "Attempt to fix further test failures"
Revert "Attempt to fix further test failures"

This reverts commit dbe4bd3200e1a86b7c8f7e9d72356f724e7880f6.

peppy/osu-framework,ppy/osu-framework,ZLima12/osu-framework,smoogipooo/osu-framework,peppy/osu-framework,peppy/osu-framework,ZLima12/osu-framework,smoogipooo/osu-framework,ppy/osu-framework,ppy/osu-framework