Port d27216dc4616d80659c0cc5d2a55394e0e1ae874 to glitch-soc
I don't like it changing files this way, but it's basically what c49213f0ea311daba590db1d7a14a641cbd9fe93 and a few others did.
Port bb5558de627ca9bc26949570025f6193cd7cbd98 to glitch-soc