Fix the merged build -- thanks jelmer for the hint!