Revert "Fix m3ulcb/m3ulcb-nogfx h3ulcb/h3ulcb-nogfx builds"