Rework the codebase to avoid unnecessary differences with upstream
Port fd3d45d38f to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
fd3d45d38f