This reverts commits 3fb4a15096 and 0e8350ca14. Either building with meson or other upstream changes was causing issues with booting, and I didn't have time to debug this properly.
3fb4a15096
0e8350ca14