I don't like it changing files this way, but it's basically what c49213f0ea311daba590db1d7a14a641cbd9fe93 and a few others did.
Port debf6ae31609dcc2fda224b4a6014848cb0e5a27 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Port 6ebd74f4fa640b9616ebb2730d97722799c6ed56 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>