decide: Deal with changes made in f9ccf06