Another fix the forced contrib upgrade logic.