Partially apply 500f4925a5 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
500f4925a5