Reordered to match RFC logic