Fix regression preventing some machines from booting