s4: reorder action to permit old provision to be correctly upgraded